From 66383eab22e63af599304daafc14e16ffc1f1aa6 Mon Sep 17 00:00:00 2001
From: Robert Longson <longsonr@gmail.com>
Date: Tue, 4 Oct 2011 11:00:32 +0100
Subject: [PATCH] Backout Bug 691646 for causing reftest failures on Linux

---
 layout/reftests/svg/pattern-scale-01-ref.svg |  7 -------
 layout/reftests/svg/pattern-scale-01.svg     | 12 ------------
 layout/reftests/svg/reftest.list             |  1 -
 layout/svg/base/src/nsSVGPatternFrame.cpp    |  6 ++----
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 layout/reftests/svg/pattern-scale-01-ref.svg
 delete mode 100644 layout/reftests/svg/pattern-scale-01.svg

diff --git a/layout/reftests/svg/pattern-scale-01-ref.svg b/layout/reftests/svg/pattern-scale-01-ref.svg
deleted file mode 100644
index b41ac098a53..00000000000
--- a/layout/reftests/svg/pattern-scale-01-ref.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<svg xmlns="http://www.w3.org/2000/svg">
-  <circle cx="100" cy="100" r="100" fill="lime"/>
-</svg>
diff --git a/layout/reftests/svg/pattern-scale-01.svg b/layout/reftests/svg/pattern-scale-01.svg
deleted file mode 100644
index 77db2a954e0..00000000000
--- a/layout/reftests/svg/pattern-scale-01.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<svg xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <pattern id="pattern" width="5" height="5" patternUnits="userSpaceOnUse" patternTransform="scale(-40)">
-      <circle cx="2.5" cy="2.5" r="2.5" fill="lime" />
-    </pattern>
-  </defs>
-  <rect width="200" height="200" fill="url(#pattern)"/>
-</svg>
diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index ce2ec1c6a2e..015e98541f9 100644
--- 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
index c910d57f1d8..f563ad9e2ed 100644
--- 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)