Bug 1492739 - Unprefix user-select. r=mats

The CSSWG decided that our behavior regarding inheritance is what we want, see [1]. [1]: w3c/csswg-drafts#3344 Differential Revision: https://phabricator.services.mozilla.com/D11585 --HG-- extra : moz-landing-system : lando
mozilla · May 17, 2019 · c1954c0 · c1954c0
1 parent 36731b4
commit c1954c0
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 28 deletions.
diff --git a/browser/base/content/test/static/browser_parsable_css.js b/browser/base/content/test/static/browser_parsable_css.js
@@ -13,14 +13,8 @@ let whitelist = [
   // CodeMirror is imported as-is, see bug 1004423.
   {sourceName: /codemirror\.css$/i,
    isFromDevTools: true},
-  // The debugger uses cross-browser CSS.
-  {sourceName: /devtools\/client\/debugger\/dist\/vendors.css/i,
-   isFromDevTools: true},
   {sourceName: /devtools\/client\/debugger\/src\/components\/([A-z\/]+).css/i,
   isFromDevTools: true},
-   // Reps uses cross-browser CSS.
-   {sourceName: /devtools-client-shared\/components\/reps\/reps.css/i,
-   isFromDevTools: true},
   // PDFjs rules needed for compat with other UAs.
   {sourceName: /web\/viewer\.css$/i,
    errorMessage: /Unknown property.*(appearance|user-select)/i,

diff --git a/devtools/server/actors/animation-type-longhand.js b/devtools/server/actors/animation-type-longhand.js
@@ -162,7 +162,7 @@ exports.ANIMATION_TYPE_FOR_LONGHANDS = [
     "-moz-user-focus",
     "-moz-user-input",
     "-moz-user-modify",
-    "-moz-user-select",
+    "user-select",
     "vector-effect",
     "visibility",
     "white-space",

diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js
@@ -1409,7 +1409,7 @@ exports.CSS_PROPERTIES = {
   "-moz-user-select": {
     "isInherited": false,
     "subproperties": [
-      "-moz-user-select"
+      "user-select"
     ],
     "supports": [],
     "values": [
@@ -2886,7 +2886,7 @@ exports.CSS_PROPERTIES = {
   "-webkit-user-select": {
     "isInherited": false,
     "subproperties": [
-      "-moz-user-select"
+      "user-select"
     ],
     "supports": [],
     "values": [
@@ -3294,7 +3294,7 @@ exports.CSS_PROPERTIES = {
       "initial-letter",
       "ime-mode",
       "scrollbar-width",
-      "-moz-user-select",
+      "user-select",
       "-moz-window-dragging",
       "-moz-force-broken-image-icon",
       "dominant-baseline",
@@ -10267,6 +10267,24 @@ exports.CSS_PROPERTIES = {
       "unset"
     ]
   },
+  "user-select": {
+    "isInherited": false,
+    "subproperties": [
+      "user-select"
+    ],
+    "supports": [],
+    "values": [
+      "-moz-none",
+      "all",
+      "auto",
+      "inherit",
+      "initial",
+      "none",
+      "revert",
+      "text",
+      "unset"
+    ]
+  },
   "vector-effect": {
     "isInherited": false,
     "subproperties": [

diff --git a/dom/animation/test/mozilla/test_moz_prefixed_properties.html b/dom/animation/test/mozilla/test_moz_prefixed_properties.html
@@ -60,7 +60,7 @@
     property: "-moz-user-modify"
   },
   {
-    property: "-moz-user-select"
+    property: "user-select"
   },
   {
     property: "-moz-window-dragging"

diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
@@ -2805,6 +2805,13 @@ var gCSSProperties = {
   "-moz-user-select": {
     domProp: "MozUserSelect",
     inherited: false,
+    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+    alias_for: "user-select",
+    subproperties: [ "user-select" ],
+  },
+  "user-select": {
+    domProp: "userSelect",
+    inherited: false,
     type: CSS_TYPE_LONGHAND,
     initial_values: [ "auto" ],
     other_values: [ "none", "text", "all", "-moz-none" ],
@@ -8383,8 +8390,8 @@ if (IsCSSPropertyPrefEnabled("layout.css.prefixes.webkit")) {
     domProp: "webkitUserSelect",
     inherited: false,
     type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
-    alias_for: "-moz-user-select",
-    subproperties: [ "-moz-user-select" ],
+    alias_for: "user-select",
+    subproperties: [ "user-select" ],
   };
   gCSSProperties["-webkit-mask"] = {
     domProp: "webkitMask",

diff --git a/servo/components/style/properties/longhands/ui.mako.rs b/servo/components/style/properties/longhands/ui.mako.rs
@@ -32,12 +32,11 @@ ${helpers.single_keyword(
 )}
 
 ${helpers.predefined_type(
-    "-moz-user-select",
+    "user-select",
     "UserSelect",
     "computed::UserSelect::Auto",
     products="gecko",
-    gecko_ffi_name="mUserSelect",
-    alias="-webkit-user-select",
+    extra_prefixes="moz webkit",
     animation_value_type="discrete",
     needs_context=False,
     spec="https://drafts.csswg.org/css-ui-4/#propdef-user-select",

diff --git a/testing/web-platform/meta/css/css-ui/parsing/user-select-computed.html.ini b/testing/web-platform/meta/css/css-ui/parsing/user-select-computed.html.ini
@@ -0,0 +1,4 @@
+[user-select-computed.html]
+  [Property user-select value 'contain' computes to 'contain']
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/css/css-ui/parsing/user-select-valid.html.ini b/testing/web-platform/meta/css/css-ui/parsing/user-select-valid.html.ini
@@ -2,15 +2,3 @@
   [e.style['user-select'\] = "contain" should set the property value]
     expected: FAIL
 
-  [e.style['user-select'\] = "all" should set the property value]
-    expected: FAIL
-
-  [e.style['user-select'\] = "none" should set the property value]
-    expected: FAIL
-
-  [e.style['user-select'\] = "text" should set the property value]
-    expected: FAIL
-
-  [e.style['user-select'\] = "auto" should set the property value]
-    expected: FAIL
-