Title: [154713] trunk
Revision
154713
Author
[email protected]
Date
2013-08-27 16:09:28 -0700 (Tue, 27 Aug 2013)

Log Message

feImage fails if referenced node contains radialGradient declaration
https://bugs.webkit.org/show_bug.cgi?id=118735

Reviewed by Darin Adler.

Source/WebCore:

Only call parent's updateRelativeLengthsInformation for graphics elements.

Tests: svg/custom/feImage-pserver-with-percentage-expected.svg
       svg/custom/feImage-pserver-with-percentage.svg

* svg/SVGElement.cpp:
(WebCore::SVGElement::updateRelativeLengthsInformation):

LayoutTests:

Add testcase from bug with small adjustments.

* svg/custom/feImage-pserver-with-percentage-expected.svg: Added.
* svg/custom/feImage-pserver-with-percentage.svg: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (154712 => 154713)


--- trunk/LayoutTests/ChangeLog	2013-08-27 22:25:19 UTC (rev 154712)
+++ trunk/LayoutTests/ChangeLog	2013-08-27 23:09:28 UTC (rev 154713)
@@ -1,3 +1,15 @@
+2013-08-27  Rob Buis  <[email protected]>
+
+        feImage fails if referenced node contains radialGradient declaration
+        https://bugs.webkit.org/show_bug.cgi?id=118735
+
+        Reviewed by Darin Adler.
+
+        Add testcase from bug with small adjustments.
+
+        * svg/custom/feImage-pserver-with-percentage-expected.svg: Added.
+        * svg/custom/feImage-pserver-with-percentage.svg: Added.
+
 2013-08-27  Chris Fleizach  <[email protected]>
 
         <https://webkit.org/b/120117> AX: <noscript> contents are exposed as static text

Added: trunk/LayoutTests/svg/custom/feImage-pserver-with-percentage-expected.svg (0 => 154713)


--- trunk/LayoutTests/svg/custom/feImage-pserver-with-percentage-expected.svg	                        (rev 0)
+++ trunk/LayoutTests/svg/custom/feImage-pserver-with-percentage-expected.svg	2013-08-27 23:09:28 UTC (rev 154713)
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%">
+  <defs>
+    <filter filterUnits="userSpaceOnUse" primitiveUnits="userSpaceOnUse" id="flt" x="0" y="0" width="50" height="100">
+      <feImage xlink:href="" />
+    </filter>
+  </defs>
+  <rect filter="url(#flt)" width="50" height="100"/>
+
+  <g transform="translate(50 0)">
+    <g id="img">
+      <rect width="50" height="100" fill="green"/>
+    </g>
+  </g>
+</svg>

Added: trunk/LayoutTests/svg/custom/feImage-pserver-with-percentage.svg (0 => 154713)


--- trunk/LayoutTests/svg/custom/feImage-pserver-with-percentage.svg	                        (rev 0)
+++ trunk/LayoutTests/svg/custom/feImage-pserver-with-percentage.svg	2013-08-27 23:09:28 UTC (rev 154713)
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%">
+  <g>
+    <filter filterUnits="userSpaceOnUse" primitiveUnits="userSpaceOnUse" id="flt" x="0" y="0" width="50" height="100">
+      <feImage xlink:href="" />
+    </filter>
+    <rect filter="url(#flt)" width="50" height="100"/>
+
+    <g transform="translate(50 0)">
+      <g id="img">
+        <radialGradient />
+        <rect width="50" height="100" fill="green"/>
+      </g>
+    </g>
+  </g>
+</svg>

Modified: trunk/Source/WebCore/ChangeLog (154712 => 154713)


--- trunk/Source/WebCore/ChangeLog	2013-08-27 22:25:19 UTC (rev 154712)
+++ trunk/Source/WebCore/ChangeLog	2013-08-27 23:09:28 UTC (rev 154713)
@@ -1,3 +1,18 @@
+2013-08-27  Rob Buis  <[email protected]>
+
+        feImage fails if referenced node contains radialGradient declaration
+        https://bugs.webkit.org/show_bug.cgi?id=118735
+
+        Reviewed by Darin Adler.
+
+        Only call parent's updateRelativeLengthsInformation for graphics elements.
+
+        Tests: svg/custom/feImage-pserver-with-percentage-expected.svg
+               svg/custom/feImage-pserver-with-percentage.svg
+
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::updateRelativeLengthsInformation):
+
 2013-08-27  Darin Adler  <[email protected]>
 
         No need for generalPasteboard (aside from "global selection mode")

Modified: trunk/Source/WebCore/svg/SVGElement.cpp (154712 => 154713)


--- trunk/Source/WebCore/svg/SVGElement.cpp	2013-08-27 22:25:19 UTC (rev 154712)
+++ trunk/Source/WebCore/svg/SVGElement.cpp	2013-08-27 23:09:28 UTC (rev 154713)
@@ -1121,6 +1121,9 @@
         m_elementsWithRelativeLengths.remove(element);
     }
 
+    if (!element->isSVGGraphicsElement())
+        return;
+
     // Find first styled parent node, and notify it that we've changed our relative length state.
     ContainerNode* node = parentNode();
     while (node) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to