Backed out changeset 9c7c061b959f (bug 1348173) for hazard busted

layout/reftests/forms/progress/reftest-stylo.list

@@ -1,29 +1,29 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== values.html values.html
-== values-rtl.html values-rtl.html
-== margin-padding.html margin-padding.html
-== margin-padding-rtl.html margin-padding-rtl.html
+fails == values.html values.html
+fails == values-rtl.html values-rtl.html
+fails == margin-padding.html margin-padding.html
+fails == margin-padding-rtl.html margin-padding-rtl.html
 fails == bar-pseudo-element.html bar-pseudo-element.html
-== bar-pseudo-element-rtl.html bar-pseudo-element-rtl.html
-== indeterminate-style-width.html indeterminate-style-width.html
+fails == bar-pseudo-element-rtl.html bar-pseudo-element-rtl.html
+fails == indeterminate-style-width.html indeterminate-style-width.html
 
 # vertical tests
-== values-vertical.html values-vertical.html
-== values-vertical-rtl.html values-vertical-rtl.html
-== margin-padding-vertical.html margin-padding-vertical.html
-== margin-padding-vertical-rtl.html margin-padding-vertical-rtl.html
-== bar-pseudo-element-vertical.html bar-pseudo-element-vertical.html
-== bar-pseudo-element-vertical-rtl.html bar-pseudo-element-vertical-rtl.html
-== indeterminate-style-height.html indeterminate-style-height.html
+fails == values-vertical.html values-vertical.html
+fails == values-vertical-rtl.html values-vertical-rtl.html
+fails == margin-padding-vertical.html margin-padding-vertical.html
+fails == margin-padding-vertical-rtl.html margin-padding-vertical-rtl.html
+fails == bar-pseudo-element-vertical.html bar-pseudo-element-vertical.html
+fails == bar-pseudo-element-vertical-rtl.html bar-pseudo-element-vertical-rtl.html
+fails == indeterminate-style-height.html indeterminate-style-height.html
 
 # The following test is disabled but kept in the repository because the
 # transformations will not behave exactly the same for <progress> and two divs.
 # However, it would be possible to manually check those.
-== transformations.html transformations.html
+fails == transformations.html transformations.html
 
 # Tests for bugs:
-== block-invalidate.html block-invalidate.html
-== in-cells.html in-cells.html
+fails == block-invalidate.html block-invalidate.html
+fails == in-cells.html in-cells.html
 == max-height.html max-height.html
 
 # Tests for block and inline orientation in combination with writing-mode

layout/style/ServoBindings.cpp

@@ -968,33 +968,6 @@ Gecko_AtomEqualsUTF8IgnoreCase(nsIAtom* aAtom, const char* aString, uint32_t aLe
   return nsContentUtils::EqualsIgnoreASCIICase(atomStr, inStr);
 }
 
-void
-Gecko_EnsureMozBorderColors(nsStyleBorder* aBorder)
-{
-  aBorder->EnsureBorderColors();
-}
-
-void Gecko_ClearMozBorderColors(nsStyleBorder* aBorder, mozilla::Side aSide)
-{
-  aBorder->ClearBorderColors(aSide);
-}
-
-void
-Gecko_AppendMozBorderColors(nsStyleBorder* aBorder, mozilla::Side aSide,
-                            nscolor aColor)
-{
-  aBorder->AppendBorderColor(aSide, aColor);
-}
-
-void
-Gecko_CopyMozBorderColors(nsStyleBorder* aDest, const nsStyleBorder* aSrc,
-                          mozilla::Side aSide)
-{
-  if (aSrc->mBorderColors) {
-    aDest->CopyBorderColorsFrom(aSrc->mBorderColors[aSide], aSide);
-  }
-}
-
 void
 Gecko_FontFamilyList_Clear(FontFamilyList* aList) {
   aList->Clear();

layout/style/ServoBindings.h

@@ -36,7 +36,6 @@ namespace mozilla {
   class FontFamilyList;
   enum FontFamilyType : uint32_t;
   struct Keyframe;
-  enum Side;
   namespace css {
     struct URLValue;
   };
@@ -240,14 +239,6 @@ const uint16_t* Gecko_GetAtomAsUTF16(nsIAtom* aAtom, uint32_t* aLength);
 bool Gecko_AtomEqualsUTF8(nsIAtom* aAtom, const char* aString, uint32_t aLength);
 bool Gecko_AtomEqualsUTF8IgnoreCase(nsIAtom* aAtom, const char* aString, uint32_t aLength);
 
-// Border style
-void Gecko_EnsureMozBorderColors(nsStyleBorder* aBorder);
-void Gecko_ClearMozBorderColors(nsStyleBorder* aBorder, mozilla::Side aSide);
-void Gecko_AppendMozBorderColors(nsStyleBorder* aBorder, mozilla::Side aSide,
-                                 nscolor aColor);
-void Gecko_CopyMozBorderColors(nsStyleBorder* aDest, const nsStyleBorder* aSrc,
-                               mozilla::Side aSide);
-
 // Font style
 void Gecko_FontFamilyList_Clear(FontFamilyList* aList);
 void Gecko_FontFamilyList_AppendNamed(FontFamilyList* aList, nsIAtom* aName, bool aQuoted);

layout/style/nsStyleStruct.cpp

@@ -366,8 +366,13 @@ nsStyleBorder::nsStyleBorder(const nsStyleBorder& aSrc)
 {
   MOZ_COUNT_CTOR(nsStyleBorder);
   if (aSrc.mBorderColors) {
-    NS_FOR_CSS_SIDES(side) {
-      CopyBorderColorsFrom(aSrc.mBorderColors[side], side);
+    EnsureBorderColors();
+    for (int32_t i = 0; i < 4; i++) {
+      if (aSrc.mBorderColors[i]) {
+        mBorderColors[i] = aSrc.mBorderColors[i]->Clone();
+      } else {
+        mBorderColors[i] = nullptr;
+      }
     }
   }
 

layout/style/nsStyleStruct.h

@@ -1162,14 +1162,6 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleBorder
     }
   }
 
-  void CopyBorderColorsFrom(const nsBorderColors* aSrcBorderColors, mozilla::Side aSide) {
-    if (aSrcBorderColors) {
-      EnsureBorderColors();
-      ClearBorderColors(aSide);
-      mBorderColors[aSide] = aSrcBorderColors->Clone();
-    }
-  }
-
   // Return whether aStyle is a visible style.  Invisible styles cause
   // the relevant computed border width to be 0.
   // Note that this does *not* consider the effects of 'border-image':

layout/style/test/stylo-failures.md

@@ -131,6 +131,14 @@ to mochitest command.
   * test_inherit_computation.html `border-image` [2]
   * test_initial_computation.html `border-image` [4]
 * Unimplemented prefixed properties:
+  * -moz-border-*-colors bug 1348173
+    * test_compute_data_with_start_struct.html `-colors` [8]
+    * test_inherit_computation.html `-colors` [8]
+    * test_inherit_storage.html `-colors` [12]
+    * test_initial_computation.html `-colors` [16]
+    * test_initial_storage.html `-colors` [24]
+    * test_value_storage.html `-colors` [96]
+    * test_shorthand_property_getters.html `-colors` [1]
   * -moz-force-broken-image-icon servo/servo#16001
     * test_compute_data_with_start_struct.html `-moz-force-broken-image-icon` [2]
     * test_inherit_computation.html `-moz-force-broken-image-icon` [2]

widget/reftests/reftest-stylo.list

@@ -1,6 +1,6 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 skip-if(!cocoaWidget) == 507947.html 507947.html
-== progressbar-fallback-default-style.html progressbar-fallback-default-style.html
+fails == progressbar-fallback-default-style.html progressbar-fallback-default-style.html
 == meter-native-style.html meter-native-style.html
 fails == meter-vertical-native-style.html meter-vertical-native-style.html
 fails == meter-fallback-default-style.html meter-fallback-default-style.html