Title: [136278] branches/chromium/1271
- Revision
- 136278
- Author
- cev...@google.com
- Date
- 2012-11-30 14:43:37 -0800 (Fri, 30 Nov 2012)
Log Message
Merge 135719
BUG=161690
Review URL: https://codereview.chromium.org/11434065
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1271/LayoutTests/svg/custom/stale-resource-data-crash-expected.txt (from rev 135719, trunk/LayoutTests/svg/custom/stale-resource-data-crash-expected.txt) (0 => 136278)
--- branches/chromium/1271/LayoutTests/svg/custom/stale-resource-data-crash-expected.txt (rev 0)
+++ branches/chromium/1271/LayoutTests/svg/custom/stale-resource-data-crash-expected.txt 2012-11-30 22:43:37 UTC (rev 136278)
@@ -0,0 +1,2 @@
+PASS: did not crash.
+
Copied: branches/chromium/1271/LayoutTests/svg/custom/stale-resource-data-crash.svg (from rev 135719, trunk/LayoutTests/svg/custom/stale-resource-data-crash.svg) (0 => 136278)
--- branches/chromium/1271/LayoutTests/svg/custom/stale-resource-data-crash.svg (rev 0)
+++ branches/chromium/1271/LayoutTests/svg/custom/stale-resource-data-crash.svg 2012-11-30 22:43:37 UTC (rev 136278)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+ <defs id="defs">
+ <filter id="f1">
+ <feDiffuseLighting>
+ <feDistantLight azimuth="45" id="light"/>
+ </feDiffuseLighting>
+ </filter>
+ <filter id="f2"/>
+ </defs>
+ <image id="img" filter="url(#f1)" xlink:href=""
+
+ <text>PASS: did not crash.</text>
+
+ <script>
+ f2 = document.getElementById('f2');
+ docElement = document.getElementById('svg');
+ light = document.getElementById('light');
+ newDefs = document.getElementById('defs').cloneNode(true);
+
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ // Force a paint at this point to generate cached filter results.
+ testRunner.display();
+ }
+
+ docElement.appendChild(newDefs);
+ docElement.appendChild(f2);
+ docElement.offsetTop;
+ light.removeAttribute('azimuth');
+ </script>
+</svg>
Modified: branches/chromium/1271/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (136277 => 136278)
--- branches/chromium/1271/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2012-11-30 22:30:59 UTC (rev 136277)
+++ branches/chromium/1271/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2012-11-30 22:43:37 UTC (rev 136278)
@@ -150,6 +150,7 @@
void RenderSVGResourceContainer::removeClient(RenderObject* client)
{
ASSERT(client);
+ removeClientFromCache(client, false);
m_clients.remove(client);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
