Changeset 99794 in webkit

Timestamp:

Nov 9, 2011, 5:53:02 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r99782.
​http://trac.webkit.org/changeset/99782
​https://bugs.webkit.org/show_bug.cgi?id=71979

broke most of the feImage tests (Requested by thorton on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-11-09

Source/WebCore:

• svg/SVGFEImageElement.cpp:

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

LayoutTests:

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-09  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r99782.
+        http://trac.webkit.org/changeset/99782
+        https://bugs.webkit.org/show_bug.cgi?id=71979
+
+        broke most of the feImage tests (Requested by thorton on
+        #webkit).
+
+        * platform/mac/svg/filters/feImage-reference-svg-primitive-expected.png: Removed.
+        * platform/mac/svg/filters/feImage-reference-svg-primitive-expected.txt: Removed.
+        * svg/filters/feImage-reference-svg-primitive.svg: Removed.
+        * svg/filters/feImage-zero-size-crash-expected.txt: Removed.
+        * svg/filters/feImage-zero-size-crash.svg: Removed.
+
 2011-11-09  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-09  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r99782.
+        http://trac.webkit.org/changeset/99782
+        https://bugs.webkit.org/show_bug.cgi?id=71979
+
+        broke most of the feImage tests (Requested by thorton on
+        #webkit).
+
+        * svg/SVGFEImageElement.cpp:
+        (WebCore::SVGFEImageElement::parseMappedAttribute):
+        (WebCore::SVGFEImageElement::build):
+
 2011-11-09  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/svg/SVGFEImageElement.cpp

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