Changeset 99782 in webkit

Timestamp:

Nov 9, 2011, 4:39:21 PM (15 years ago)

Author:

timothy_horton@apple.com

Message:

feImage referencing a primitive draws incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=71731
<rdar://problem/10408178>

Reviewed by Simon Fraser.

Don't attempt to resolve an <feImage>'s referenced element until it's used, as it
may not exist at the time the attribute is set on the <feImage>.

Don't attempt to render an <feImage> if the referenced element is of size 0x0.

Tests: svg/filters/feImage-reference-svg-primitive.svg

svg/filters/feImage-zero-size-crash.svg

• svg/SVGFEImageElement.cpp:

(WebCore::SVGFEImageElement::parseMappedAttribute):
(WebCore::SVGFEImageElement::build):

Add a test (feImage-reference-svg-primitive) that ensures that having
an <feImage> referencing an SVG primitive which is declared after it
successfully paints the referenced object.

Add a test (feImage-zero-size-crash) to see if we crash when <feImage>
references an object with 0x0 size.

• platform/mac/svg/filters/feImage-reference-svg-primitive-expected.png: Added.
• platform/mac/svg/filters/feImage-reference-svg-primitive-expected.txt: Added.
• svg/filters/feImage-reference-svg-primitive.svg: Added.
• svg/filters/feImage-zero-size-crash-expected.txt: Added.
• svg/filters/feImage-zero-size-crash.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/filters/feImage-reference-svg-primitive-expected.png (added)
• LayoutTests/platform/mac/svg/filters/feImage-reference-svg-primitive-expected.txt (added)
• LayoutTests/svg/filters/feImage-reference-svg-primitive.svg (added)
• LayoutTests/svg/filters/feImage-zero-size-crash-expected.txt (added)
• LayoutTests/svg/filters/feImage-zero-size-crash.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGFEImageElement.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-09  Tim Horton  <timothy_horton@apple.com>
+
+        feImage referencing a primitive draws incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=71731
+        <rdar://problem/10408178>
+
+        Reviewed by Simon Fraser.
+
+        Add a test (feImage-reference-svg-primitive) that ensures that having
+        an <feImage> referencing an SVG primitive which is declared after it
+        successfully paints the referenced object.
+        
+        Add a test (feImage-zero-size-crash) to see if we crash when <feImage>
+        references an object with 0x0 size.
+
+        * platform/mac/svg/filters/feImage-reference-svg-primitive-expected.png: Added.
+        * platform/mac/svg/filters/feImage-reference-svg-primitive-expected.txt: Added.
+        * svg/filters/feImage-reference-svg-primitive.svg: Added.
+        * svg/filters/feImage-zero-size-crash-expected.txt: Added.
+        * svg/filters/feImage-zero-size-crash.svg: Added.
+
 2011-11-09  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-09  Tim Horton  <timothy_horton@apple.com>
+
+        feImage referencing a primitive draws incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=71731
+        <rdar://problem/10408178>
+
+        Reviewed by Simon Fraser.
+        
+        Don't attempt to resolve an <feImage>'s referenced element until it's used, as it
+        may not exist at the time the attribute is set on the <feImage>.
+        
+        Don't attempt to render an <feImage> if the referenced element is of size 0x0.
+
+        Tests: svg/filters/feImage-reference-svg-primitive.svg
+               svg/filters/feImage-zero-size-crash.svg
+
+        * svg/SVGFEImageElement.cpp:
+        (WebCore::SVGFEImageElement::parseMappedAttribute):
+        (WebCore::SVGFEImageElement::build):
+
 2011-11-09  Dominic Cooney  <dominicc@chromium.org>
 

trunk/Source/WebCore/svg/SVGFEImageElement.cpp

@@ -114 +114 @@
 
     if (SVGURIReference::parseMappedAttribute(attr)) {
-        requestImageResource();
+        m_cachedImage = 0;
+        m_targetImage.clear();
         return;
     }
@@ -163 +164 @@
 PassRefPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* filter)
 {
+    if (!m_cachedImage && !m_targetImage)
+        requestImageResource();
+
     if (!m_cachedImage && !m_targetImage) {
         Element* hrefElement = SVGURIReference::targetElementFromIRIString(href(), document());
@@ -173 +177 @@
 
         IntRect targetRect = enclosingIntRect(renderer->objectBoundingBox());
+
+        if (targetRect.isEmpty())
+            return 0;
+
         m_targetImage = ImageBuffer::create(targetRect.size(), ColorSpaceLinearRGB);