From addbf1b91b2b61504971cc9784cc86e7628b3d76 Mon Sep 17 00:00:00 2001
From: Robert Longson <longsonr@gmail.com>
Date: Sun, 3 Apr 2011 13:23:40 +0100
Subject: [PATCH] Bug 641858 - text does not reflect dynamic gradient/pattern
 changes r=jwatt

---
 layout/reftests/svg/gradient-live-01-ref.svg | 4 +++-
 layout/reftests/svg/gradient-live-01a.svg    | 4 +++-
 layout/reftests/svg/gradient-live-01b.svg    | 4 +++-
 layout/reftests/svg/gradient-live-01c.svg    | 4 +++-
 layout/reftests/svg/gradient-live-01d.svg    | 4 +++-
 layout/svg/base/src/nsSVGGeometryFrame.cpp   | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/layout/reftests/svg/gradient-live-01-ref.svg b/layout/reftests/svg/gradient-live-01-ref.svg
index 8f8c66e1b4e..2b02d6926c4 100644
--- a/layout/reftests/svg/gradient-live-01-ref.svg
+++ b/layout/reftests/svg/gradient-live-01-ref.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" 
-     xmlns:xlink="http://www.w3.org/1999/xlink">
+     xmlns:xlink="http://www.w3.org/1999/xlink" font-size="80">
 
 <linearGradient id="grad1" gradientUnits="objectBoundingBox" x1="0" y1="0" x2="1" y2="0">
   <stop id="green"   stop-color="#00dd00"   offset="0"/>
@@ -10,5 +10,7 @@
 
 <linearGradient id="grad2" xlink:href="#grad1"/>
 <rect x="20" y="150" width="440" height="80" fill="url(#grad2)" />
+<text x="20" y="300" width="440" height="80" fill="url(#grad1)">gradiation</text>
+<text x="20" y="400" width="440" height="80" fill="url(#grad2)">gradiation</text>
 
 </svg>
diff --git a/layout/reftests/svg/gradient-live-01a.svg b/layout/reftests/svg/gradient-live-01a.svg
index df3e8259a15..4c3c1633fef 100644
--- a/layout/reftests/svg/gradient-live-01a.svg
+++ b/layout/reftests/svg/gradient-live-01a.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" 
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     class="reftest-wait">
+     class="reftest-wait" font-size="80">
 
 <script type="application/javascript">
   document.addEventListener("MozReftestInvalidate", doTest, false);
@@ -24,5 +24,7 @@
 
 <linearGradient id="grad2" xlink:href="#grad1"/>
 <rect x="20" y="150" width="440" height="80" fill="url(#grad2)" />
+<text x="20" y="300" width="440" height="80" fill="url(#grad1)">gradiation</text>
+<text x="20" y="400" width="440" height="80" fill="url(#grad2)">gradiation</text>
 
 </svg>
diff --git a/layout/reftests/svg/gradient-live-01b.svg b/layout/reftests/svg/gradient-live-01b.svg
index 60740c0e87f..d5f134b9155 100644
--- a/layout/reftests/svg/gradient-live-01b.svg
+++ b/layout/reftests/svg/gradient-live-01b.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" 
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     class="reftest-wait">
+     class="reftest-wait" font-size="80">
 
 <script type="application/javascript">
   document.addEventListener("MozReftestInvalidate", doTest, false);
@@ -22,5 +22,7 @@
 
 <linearGradient id="grad2" xlink:href="#grad1"/>
 <rect x="20" y="150" width="440" height="80" fill="url(#grad2)" />
+<text x="20" y="300" width="440" height="80" fill="url(#grad1)">gradiation</text>
+<text x="20" y="400" width="440" height="80" fill="url(#grad2)">gradiation</text>
 
 </svg>
diff --git a/layout/reftests/svg/gradient-live-01c.svg b/layout/reftests/svg/gradient-live-01c.svg
index cc985bcadfd..5cf26a20ed8 100644
--- a/layout/reftests/svg/gradient-live-01c.svg
+++ b/layout/reftests/svg/gradient-live-01c.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" 
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     class="reftest-wait">
+     class="reftest-wait" font-size="80">
 
  <script type="application/javascript">
    document.addEventListener("MozReftestInvalidate", doTest, false);
@@ -23,5 +23,7 @@
 
 <linearGradient id="grad2" xlink:href="#grad1"/>
 <rect x="20" y="150" width="440" height="80" fill="url(#grad2)" />
+<text x="20" y="300" width="440" height="80" fill="url(#grad1)">gradiation</text>
+<text x="20" y="400" width="440" height="80" fill="url(#grad2)">gradiation</text>
 
 </svg>
diff --git a/layout/reftests/svg/gradient-live-01d.svg b/layout/reftests/svg/gradient-live-01d.svg
index 41cba3f881b..bbfe3098ee1 100644
--- a/layout/reftests/svg/gradient-live-01d.svg
+++ b/layout/reftests/svg/gradient-live-01d.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" 
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     class="reftest-wait">
+     class="reftest-wait" font-size="80">
      
 <!-- Tests that gradients are live to stop addition. -->
 
@@ -26,5 +26,7 @@ function addBlueStop()
 
 <linearGradient id="grad2" xlink:href="#grad1"/>
 <rect x="20" y="150" width="440" height="80" fill="url(#grad2)" />
+<text x="20" y="300" width="440" height="80" fill="url(#grad1)">gradiation</text>
+<text x="20" y="400" width="440" height="80" fill="url(#grad2)">gradiation</text>
 
 </svg>
diff --git a/layout/svg/base/src/nsSVGGeometryFrame.cpp b/layout/svg/base/src/nsSVGGeometryFrame.cpp
index 392cafa184c..e88691729f7 100644
--- a/layout/svg/base/src/nsSVGGeometryFrame.cpp
+++ b/layout/svg/base/src/nsSVGGeometryFrame.cpp
@@ -68,8 +68,10 @@ nsSVGGeometryFrame::GetPaintServer(const nsStyleSVGPaint *aPaint,
   if (aPaint->mType != eStyleSVGPaintType_Server)
     return nsnull;
 
+  nsIFrame *frame = mContent->IsNodeOfType(nsINode::eTEXT) ?
+                      GetParent() : this;
   nsSVGPaintingProperty *property =
-    nsSVGEffects::GetPaintingProperty(aPaint->mPaint.mPaintServer, this, aType);
+    nsSVGEffects::GetPaintingProperty(aPaint->mPaint.mPaintServer, frame, aType);
   if (!property)
     return nsnull;
   nsIFrame *result = property->GetReferencedFrame();