Backed out changeset 86c3a0e9fa87 because of the Windows optimize reftest failure
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 23 Nov 2010 14:26:31 -0500
changeset 58090 c639bd049de87977f31d1b5ab3750568fe4d482f
parent 58030 86c3a0e9fa87a9b0967b89824c35f9b2f9355590
child 58091 cbdf3ff3e88af95430416c0043e63ee6b0359643
push id17150
push usereakhgari@mozilla.com
push dateTue, 23 Nov 2010 19:27:33 +0000
treeherdermozilla-central@cbdf3ff3e88a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b8pre
backs out86c3a0e9fa87a9b0967b89824c35f9b2f9355590
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 86c3a0e9fa87 because of the Windows optimize reftest failure
layout/reftests/svg/reftest.list
layout/reftests/svg/text-gradient-03.svg
layout/svg/base/src/nsSVGGlyphFrame.cpp
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -153,17 +153,16 @@ random-if(gtk2Widget) == objectBoundingB
 == style-without-type-attribute.svg pass.svg
 == svg-in-foreignObject-01.xhtml svg-in-foreignObject-01-ref.xhtml
 == svg-in-foreignObject-02.xhtml svg-in-foreignObject-01-ref.xhtml # reuse -01-ref.xhtml
 random-if(gtk2Widget) == text-font-weight-01.svg text-font-weight-01-ref.svg # bug 386713
 == switch-01.svg pass.svg
 asserts(3) == symbol-01.svg symbol-01-ref.svg # see bug 563481
 == text-gradient-01.svg text-gradient-01-ref.svg
 random-if(winWidget) == text-gradient-02.svg text-gradient-02-ref.svg # see bug 590101
-== text-gradient-03.svg pass.svg
 == text-in-link-01.svg text-in-link-01-ref.svg
 == text-in-link-02.svg text-in-link-02-ref.svg
 == text-in-link-03.svg text-in-link-03-ref.svg
 # Tests for bug 546813: sanity-check using HTML text, then test SVG behavior.
 != text-language-00.xhtml text-language-00-ref.xhtml
 random-if(gtk2Widget) != text-language-01.xhtml text-language-01-ref.xhtml # Fails on Linux tryserver due to lack of CJK fonts.
 == text-layout-01.svg text-layout-01-ref.svg
 == text-layout-02.svg text-layout-02-ref.svg
deleted file mode 100644
--- a/layout/reftests/svg/text-gradient-03.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/licenses/publicdomain/
--->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-
-  <title>Testcase for gradient on text</title>
-
-  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=611975 -->
-  <defs>
-    <linearGradient id="grad" x1="0" y1="-0.1" x2="0" y2="1" gradientUnits="objectBoundingBox">
-      <stop stop-color="red" offset="-10%"/>
-      <stop stop-color="lime" offset="0%"/>
-    </linearGradient>
-  </defs>
-
-  <g fill="lime">
-    <rect width="100%" height="100%"/>
-    <text x="100" y="100" stroke-width="5" stroke="url(#grad)" font-size="80px">SHOULD NOT SEE THIS</text>
-  </g>
-
-</svg>
--- a/layout/svg/base/src/nsSVGGlyphFrame.cpp
+++ b/layout/svg/base/src/nsSVGGlyphFrame.cpp
@@ -376,19 +376,17 @@ nsSVGGlyphFrame::PaintSVG(nsSVGRenderSta
   // it so we don't leak them into the next object we draw
   gfx->Save();
   SetupGlobalTransform(gfx);
 
   CharacterIterator iter(this, PR_TRUE);
   iter.SetInitialMatrix(gfx);
 
   if (SetupCairoFill(gfx)) {
-    gfxMatrix matrix = gfx->CurrentMatrix();
     FillCharacters(&iter, gfx);
-    gfx->SetMatrix(matrix);
   }
 
   if (SetupCairoStroke(gfx)) {
     // SetupCairoStroke will clear mTextRun whenever
     // there is a pattern or gradient on the text
     iter.Reset();
 
     gfx->NewPath();