Backed out changeset a2030f611422 (bug 1590894) for causing mochitest failure at layout/style/test/test_value_computation.html
authorDaniel Varga <dvarga@mozilla.com>
Sun, 15 Mar 2020 23:09:42 +0200
changeset 518879 f14f678590b7b71de62740c3ea540b48eb17397b
parent 518878 a2030f611422814034b8c2ddf7014aea8b05bb56
child 518880 a0a22903ead2159fa58985684158462de0a62891
push id37218
push userrmaries@mozilla.com
push dateMon, 16 Mar 2020 09:28:04 +0000
treeherdermozilla-central@6199f7b91e8b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1590894
milestone76.0a1
backs outa2030f611422814034b8c2ddf7014aea8b05bb56
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset a2030f611422 (bug 1590894) for causing mochitest failure at layout/style/test/test_value_computation.html
layout/style/test/property_database.js
servo/components/style/values/specified/color.rs
testing/web-platform/meta/css/css-color/parsing/system-color-valid.html.ini
testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html.ini
testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html.ini
testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html.ini
testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html.ini
testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html.ini
testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html.ini
testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html.ini
testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html.ini
testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html.ini
testing/web-platform/tests/css/css-color/parsing/color-valid.html
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -5287,35 +5287,16 @@ var gCSSProperties = {
       "hsl(720, 200%, 200%, 2.0)",
       "hsla(720 200% 200% / 200%)",
       "hsl(480deg, 20%, 30%, 0.3)",
       "hsl(55grad, 400%, 30%)",
       "hsl(0.5grad 400% 500% / 9.0)",
       "hsl(33rad 100% 90% / 4)",
       "hsl(0.33turn, 40%, 40%, 10%)",
       "hsl(63e292, 41%, 34%)",
-      /* CSS4 System Colors */
-      "canvas",
-      "canvastext",
-      "linktext",
-      "visitedtext",
-      "activetext",
-      "buttonface",
-      "buttontext",
-      "field",
-      "fieldtext",
-      "highlight",
-      "highlighttext",
-      "graytext",
-      /* Preserve previously available specially prefixed colors */
-      "-moz-activehyperlinktext",
-      "-moz-default-background-color",
-      "-moz-default-color",
-      "-moz-hyperlinktext",
-      "-moz-visitedhyperlinktext",
     ],
     invalid_values: [
       "#f",
       "#ff",
       "#fffff",
       "#fffffff",
       "#fffffffff",
       "rgb(100%, 0, 100%)",
--- a/servo/components/style/values/specified/color.rs
+++ b/servo/components/style/values/specified/color.rs
@@ -135,20 +135,18 @@ pub enum SystemColor {
     Threedface,
     Threedhighlight,
     Threedlightshadow,
     Threedshadow,
     Window,
     Windowframe,
     Windowtext,
     MozButtondefault,
-    #[parse(aliases = "-moz-default-color")]
-    Canvastext,
-    #[parse(aliases = "-moz-default-background-color")]
-    Canvas,
+    MozDefaultColor,
+    MozDefaultBackgroundColor,
     MozDialog,
     MozDialogtext,
     /// Used to highlight valid regions to drop something onto.
     MozDragtargetzone,
     /// Used for selected but not focused cell backgrounds.
     MozCellhighlight,
     /// Used for selected but not focused cell text.
     MozCellhighlighttext,
@@ -227,22 +225,19 @@ pub enum SystemColor {
     /// Hyperlink color extracted from the system, not affected by the
     /// browser.anchor_color user pref.
     ///
     /// There is no OS-specified safe background color for this text, but it is
     /// used regularly within Windows and the Gnome DE on Dialog and Window
     /// colors.
     MozNativehyperlinktext,
 
-    #[parse(aliases = "-moz-hyperlinktext")]
-    Linktext,
-    #[parse(aliases = "-moz-activehyperlinktext")]
-    Activetext,
-    #[parse(aliases = "-moz-visitedhyperlinktext")]
-    Visitedtext,
+    MozHyperlinktext,
+    MozActivehyperlinktext,
+    MozVisitedhyperlinktext,
 
     /// Combobox widgets
     MozComboboxtext,
     MozCombobox,
 
     MozGtkInfoBarText,
 
     #[css(skip)]
@@ -253,21 +248,21 @@ pub enum SystemColor {
 impl SystemColor {
     #[inline]
     fn compute(&self, cx: &Context) -> ComputedColor {
         use crate::gecko_bindings::bindings;
 
         let prefs = cx.device().pref_sheet_prefs();
 
         convert_nscolor_to_computedcolor(match *self {
-            SystemColor::Canvastext => prefs.mDefaultColor,
-            SystemColor::Canvas => prefs.mDefaultBackgroundColor,
-            SystemColor::Linktext => prefs.mLinkColor,
-            SystemColor::Activetext => prefs.mActiveLinkColor,
-            SystemColor::Visitedtext => prefs.mVisitedLinkColor,
+            SystemColor::MozDefaultColor => prefs.mDefaultColor,
+            SystemColor::MozDefaultBackgroundColor => prefs.mDefaultBackgroundColor,
+            SystemColor::MozHyperlinktext => prefs.mLinkColor,
+            SystemColor::MozActivehyperlinktext => prefs.mActiveLinkColor,
+            SystemColor::MozVisitedhyperlinktext => prefs.mVisitedLinkColor,
 
             _ => unsafe {
                 bindings::Gecko_GetLookAndFeelSystemColor(*self as i32, cx.device().document())
             },
         })
     }
 }
 
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/css/css-color/parsing/system-color-valid.html.ini
@@ -0,0 +1,16 @@
+[system-color-valid.html]
+  [e.style['color'\] = "VisitedText" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "ActiveText" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "CanvasText" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "LinkText" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "Canvas" should set the property value]
+    expected: FAIL
+
deleted file mode 100644
--- a/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[forced-colors-mode-backplate-01.html]
-  expected: FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[forced-colors-mode-backplate-02.html]
-  expected: FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[forced-colors-mode-backplate-03.html]
-  expected: FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[forced-colors-mode-backplate-04.html]
-  expected: FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[forced-colors-mode-backplate-05.html]
-  expected: FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[forced-colors-mode-backplate-06.html]
-  expected: FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[forced-colors-mode-backplate-08.html]
-  expected: FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[forced-colors-mode-backplate-09.html]
-  expected: FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[forced-colors-mode-backplate-10.html]
-  expected: FAIL
--- a/testing/web-platform/tests/css/css-color/parsing/color-valid.html
+++ b/testing/web-platform/tests/css/css-color/parsing/color-valid.html
@@ -23,11 +23,13 @@ test_valid_value("color", "rgb(100%, 0%,
 test_valid_value("color", "rgba(2, 3, 4, 0.5)"); // Safari serializes alpha-value 0.498039
 test_valid_value("color", "rgba(2, 3, 4, 50%)", "rgba(2, 3, 4, 0.5)"); // Safari serializes alpha-value 0.498039
 test_valid_value("color", "hsl(120, 100%, 50%)", ["rgb(0, 255, 0)", "hsl(120, 100%, 50%)"]);
 test_valid_value("color", "hsla(120, 100%, 50%, 0.25)", ["rgba(0, 255, 0, 0.25)", "hsla(120, 100%, 50%, 0.25)"]); // Safari serializes alpha-value 0.247059
 test_valid_value("color", "rgb(-2, 3, 4)", "rgb(0, 3, 4)");
 test_valid_value("color", "rgb(100, 200, 300)", "rgb(100, 200, 255)");
 test_valid_value("color", "rgb(20, 10, 0, -10)", "rgba(20, 10, 0, 0)"); // Not supported by Edge/Safari.
 test_valid_value("color", "rgb(100%, 200%, 300%)", "rgb(255, 255, 255)");
+test_valid_value("color", "field");
+test_valid_value("color", "fieldtext");
 </script>
 </body>
 </html>