Backout Bug 691646 for causing reftest failures on Linux

ehsan · Oct 4, 2011 · 66383ea · 66383ea
1 parent 1085599
commit 66383ea
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 24 deletions.
diff --git a/layout/reftests/svg/pattern-scale-01-ref.svg b/layout/reftests/svg/pattern-scale-01-ref.svg
diff --git a/layout/reftests/svg/pattern-scale-01.svg b/layout/reftests/svg/pattern-scale-01.svg
diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
@@ -176,7 +176,6 @@ fails-if(Android&&layersOpenGL) == path-04.svg pass.svg
 == pattern-live-01a.svg pattern-live-01-ref.svg
 == pattern-live-01b.svg pattern-live-01-ref.svg
 == pattern-live-01c.svg pattern-live-01-ref.svg
-== pattern-scale-01.svg pattern-scale-01-ref.svg
 == pattern-transform-presence-01.svg pattern-transform-presence-01-ref.svg
 == polygon-marker-01.svg pass.svg
 == polygon-points-negative-01.svg pass.svg

diff --git a/layout/svg/base/src/nsSVGPatternFrame.cpp b/layout/svg/base/src/nsSVGPatternFrame.cpp
@@ -261,10 +261,8 @@ nsSVGPatternFrame::PaintPattern(gfxASurface** surface,
 
   bool resultOverflows;
   gfxIntSize surfaceSize =
-    nsSVGUtils::ConvertToSurfaceSize(
-      gfxSize(patternWidth * fabs(patternMatrix->xx),
-              patternHeight * fabs(patternMatrix->yy)),
-      &resultOverflows);
+    nsSVGUtils::ConvertToSurfaceSize(gfxSize(patternWidth, patternHeight),
+                                     &resultOverflows);
 
   // 0 disables rendering, < 0 is an error
   if (surfaceSize.width <= 0 || surfaceSize.height <= 0)