Diff
Modified: trunk/LayoutTests/ChangeLog (99793 => 99794)
--- trunk/LayoutTests/ChangeLog 2011-11-10 01:41:24 UTC (rev 99793)
+++ trunk/LayoutTests/ChangeLog 2011-11-10 01:53:02 UTC (rev 99794)
@@ -1,3 +1,18 @@
+2011-11-09 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
Fix up expected results after http://trac.webkit.org/changeset/99772.
Deleted: trunk/LayoutTests/platform/mac/svg/filters/feImage-reference-svg-primitive-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/svg/filters/feImage-reference-svg-primitive-expected.txt (99793 => 99794)
--- trunk/LayoutTests/platform/mac/svg/filters/feImage-reference-svg-primitive-expected.txt 2011-11-10 01:41:24 UTC (rev 99793)
+++ trunk/LayoutTests/platform/mac/svg/filters/feImage-reference-svg-primitive-expected.txt 2011-11-10 01:53:02 UTC (rev 99794)
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (84,0) size 331x315
- RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGResourceFilter {filter} [id="image"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
- [feImage image-size="200x200"]
- RenderSVGResourceFilter {filter} [id="flood"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
- [feFlood flood-color="#008000" flood-opacity="1.00"]
- RenderSVGPath {circle} at (0,0) size 250x150 [fill={[type=SOLID] [color=#0000FF]}] [cx=0.00] [cy=0.00] [r=100.00]
- RenderSVGPath {rect} at (84,0) size 183x167 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
- [filter="image"] RenderSVGResourceFilter {filter} at (-10,-10) size 120x120
- RenderSVGPath {rect} at (234,135) size 181x180 [fill={[type=SOLID] [color=#000000]}] [x=100.00] [y=100.00] [width=100.00] [height=100.00]
- [filter="flood"] RenderSVGResourceFilter {filter} at (90,90) size 120x120
Deleted: trunk/LayoutTests/svg/filters/feImage-reference-svg-primitive.svg (99793 => 99794)
--- trunk/LayoutTests/svg/filters/feImage-reference-svg-primitive.svg 2011-11-10 01:41:24 UTC (rev 99793)
+++ trunk/LayoutTests/svg/filters/feImage-reference-svg-primitive.svg 2011-11-10 01:53:02 UTC (rev 99794)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 400 400">
- <title>There should be a single red quarter-circle and a single green square.</title>
- <defs>
- <filter id="image">
- <feImage xlink:href="" />
- </filter>
- <filter id="flood">
- <feFlood flood-color="green" />
- </filter>
- <circle id="circle" r="100" fill="blue" />
- </defs>
- <rect x="0" y="0" width="100" height="100" filter="url(#image)" />
- <rect x="100" y="100" width="100" height="100" filter="url(#flood)" />
-</svg>
Deleted: trunk/LayoutTests/svg/filters/feImage-zero-size-crash-expected.txt (99793 => 99794)
--- trunk/LayoutTests/svg/filters/feImage-zero-size-crash-expected.txt 2011-11-10 01:41:24 UTC (rev 99793)
+++ trunk/LayoutTests/svg/filters/feImage-zero-size-crash-expected.txt 2011-11-10 01:53:02 UTC (rev 99794)
@@ -1,2 +0,0 @@
-PASS
-
Deleted: trunk/LayoutTests/svg/filters/feImage-zero-size-crash.svg (99793 => 99794)
--- trunk/LayoutTests/svg/filters/feImage-zero-size-crash.svg 2011-11-10 01:41:24 UTC (rev 99793)
+++ trunk/LayoutTests/svg/filters/feImage-zero-size-crash.svg 2011-11-10 01:53:02 UTC (rev 99794)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 400 400">
- <title>This test passes if it doesn't crash.</title>
- <text id="log" />
- <defs>
- <circle id="circle" r="0" fill="red" />
- <filter id="image">
- <feImage xlink:href="" />
- </filter>
- </defs>
- <rect x="0" y="0" width="100" height="100" filter="url(#image)" />
- <rect x="100" y="100" width="100" height="100" fill="green" />
- <script>
- <![CDATA[
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
- var log = document.getElementById("log");
- log.appendChild(document.createTextNode("PASS"));
- ]]>
- </script>
-</svg>
Modified: trunk/Source/WebCore/ChangeLog (99793 => 99794)
--- trunk/Source/WebCore/ChangeLog 2011-11-10 01:41:24 UTC (rev 99793)
+++ trunk/Source/WebCore/ChangeLog 2011-11-10 01:53:02 UTC (rev 99794)
@@ -1,3 +1,16 @@
+2011-11-09 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
Remove [CanBeConstructed] IDL from CodeGenerator{JS,V8}.pm
Modified: trunk/Source/WebCore/svg/SVGFEImageElement.cpp (99793 => 99794)
--- trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2011-11-10 01:41:24 UTC (rev 99793)
+++ trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2011-11-10 01:53:02 UTC (rev 99794)
@@ -113,8 +113,7 @@
}
if (SVGURIReference::parseMappedAttribute(attr)) {
- m_cachedImage = 0;
- m_targetImage.clear();
+ requestImageResource();
return;
}
@@ -163,9 +162,6 @@
PassRefPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* filter)
{
- if (!m_cachedImage && !m_targetImage)
- requestImageResource();
-
if (!m_cachedImage && !m_targetImage) {
Element* hrefElement = SVGURIReference::targetElementFromIRIString(href(), document());
if (!hrefElement || !hrefElement->isSVGElement())
@@ -176,10 +172,6 @@
return 0;
IntRect targetRect = enclosingIntRect(renderer->objectBoundingBox());
-
- if (targetRect.isEmpty())
- return 0;
-
m_targetImage = ImageBuffer::create(targetRect.size(), ColorSpaceLinearRGB);
AffineTransform contentTransformation;
