Backed out changeset e2881c49e123 (bug 382721) for crashtest failures in 730559.html. r=backout on a CLOSED TREE

dom/plugins/test/reftest/reftest.list

@@ -4,10 +4,9 @@ fails-if(!haveTestPlugin) == plugin-sanity.html div-sanity.html
 fails-if(!haveTestPlugin) fuzzy-if(skiaContent,1,160000) == plugin-alpha-zindex.html div-alpha-zindex.html
 fails-if(!haveTestPlugin) fuzzy-if(skiaContent,1,164000) == plugin-alpha-opacity.html div-alpha-opacity.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == windowless-clipping-1.html windowless-clipping-1-ref.html # bug 631832
-# fuzzy because of anti-aliasing in dashed border
-fuzzy(16,256) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == border-padding-1.html border-padding-1-ref.html # bug 629430
-fuzzy(16,256) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == border-padding-2.html border-padding-2-ref.html # bug 629430
-fuzzy(16,256) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(!haveTestPlugin) skip-if(Android||B2G) == border-padding-3.html border-padding-3-ref.html # bug 629430 # bug 773482
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == border-padding-1.html border-padding-1-ref.html # bug 629430
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == border-padding-2.html border-padding-2-ref.html # bug 629430
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(!haveTestPlugin) skip-if(Android||B2G) == border-padding-3.html border-padding-3-ref.html # bug 629430 # bug 773482
 # The following two "pluginproblemui-direction" tests are unreliable on all platforms. They should be re-written or replaced.
 #random-if(cocoaWidget||d2d||/^Windows\x20NT\x205\.1/.test(http.oscpu)) fails-if(!haveTestPlugin&&!Android) == pluginproblemui-direction-1.html pluginproblemui-direction-1-ref.html # bug 567367
 #random-if(cocoaWidget) fails-if(!haveTestPlugin&&!Android) == pluginproblemui-direction-2.html pluginproblemui-direction-2-ref.html

layout/base/nsCSSRenderingBorders.h

@@ -65,10 +65,8 @@ class nsCSSBorderRenderer final
   typedef mozilla::gfx::DrawTarget DrawTarget;
   typedef mozilla::gfx::Float Float;
   typedef mozilla::gfx::Path Path;
-  typedef mozilla::gfx::Point Point;
   typedef mozilla::gfx::Rect Rect;
   typedef mozilla::gfx::RectCornerRadii RectCornerRadii;
-  typedef mozilla::gfx::StrokeOptions StrokeOptions;
 
 public:
 
@@ -136,9 +134,6 @@ private:
   // For the given style, is the given corner a solid color?
   bool IsSolidCornerStyle(uint8_t aStyle, mozilla::css::Corner aCorner);
 
-  // For the given corner, is the given corner mergeable into one dot?
-  bool IsCornerMergeable(mozilla::css::Corner aCorner);
-
   // For the given solid corner, what color style should be used?
   BorderColorStyle BorderColorStyleForSolidCorner(uint8_t aStyle, mozilla::css::Corner aCorner);
 
@@ -161,11 +156,6 @@ private:
   // is taken care of by the ADD compositing.
   already_AddRefed<Path> GetSideClipSubPath(mozilla::css::Side aSide);
 
-  // Return start or end point for dashed/dotted side
-  Point GetStraightBorderPoint(mozilla::css::Side aSide,
-                               mozilla::css::Corner aCorner,
-                               bool* aIsUnfilled);
-
   // Given a set of sides to fill and a color, do so in the fastest way.
   //
   // Stroke tends to be faster for smaller borders because it doesn't go
@@ -196,16 +186,11 @@ private:
   // function used by the above to handle -moz-border-colors
   void DrawBorderSidesCompositeColors(int aSides, const nsBorderColors *compositeColors);
 
-  // Setup the stroke options for the given dashed/dotted side
-  void SetupDashedOptions(StrokeOptions* aStrokeOptions,
-                          Float aDash[2], mozilla::css::Side aSide,
-                          Float aBorderLength);
+  // draw the given dashed side
+  void DrawDashedSide (mozilla::css::Side aSide);
 
-  // Draw the given dashed/dotte side
-  void DrawDashedOrDottedSide(mozilla::css::Side aSide);
-
-  // Draw the given dotted side, each dot separately
-  void DrawDottedSideSlow(mozilla::css::Side aSide);
+  // Setup the stroke style for a given side
+  void SetupStrokeStyle(mozilla::css::Side aSize);
 
   // Analyze if all border sides have the same width.
   bool AllBordersSameWidth();

layout/reftests/bugs/461512-1-ref.html

@@ -49,7 +49,7 @@
   </head>
   <body>
     <p style="border-style: solid;">&nbsp;</p>
-    <!-- <p style="border-style: dashed;">&nbsp;</p> -->
+    <p style="border-style: dashed;">&nbsp;</p>
     <!-- <p style="border-style: dotted;">&nbsp;</p> -->
     <p style="border-style: double;">&nbsp;</p>
     <div class="mask tr"></div>

layout/reftests/bugs/461512-1.html

@@ -12,7 +12,7 @@
       /**
        * XXX we cannot test the corner by this testing because when the corner
        *     is joined with anti-aliased, the edge isn't matching with the
-       *     reference.  The dashed and dotted line's anti-aliasing are same.
+       *     reference.  The dotted line's anti-aliasing is same.
        */
 
       /* Cover the coners by the white div element */
@@ -40,7 +40,7 @@
   </head>
   <body>
     <p style="border-style: solid;">&nbsp;</p>
-    <!-- <p style="border-style: dashed;">&nbsp;</p> -->
+    <p style="border-style: dashed;">&nbsp;</p>
     <!-- <p style="border-style: dotted;">&nbsp;</p> -->
     <p style="border-style: double;">&nbsp;</p>
     <div class="tr"></div>