Title: [139661] branches/chromium/1364
- Revision
- 139661
- Author
- cev...@google.com
- Date
- 2013-01-14 14:11:30 -0800 (Mon, 14 Jan 2013)
Log Message
Merge 139457
BUG=168969
Review URL: https://codereview.chromium.org/11879026
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1364/LayoutTests/svg/custom/use-rebuild-resources-crash-expected.txt (from rev 139457, trunk/LayoutTests/svg/custom/use-rebuild-resources-crash-expected.txt) (0 => 139661)
--- branches/chromium/1364/LayoutTests/svg/custom/use-rebuild-resources-crash-expected.txt (rev 0)
+++ branches/chromium/1364/LayoutTests/svg/custom/use-rebuild-resources-crash-expected.txt 2013-01-14 22:11:30 UTC (rev 139661)
@@ -0,0 +1,2 @@
+PASS: Did not crash.
+
Copied: branches/chromium/1364/LayoutTests/svg/custom/use-rebuild-resources-crash.svg (from rev 139457, trunk/LayoutTests/svg/custom/use-rebuild-resources-crash.svg) (0 => 139661)
--- branches/chromium/1364/LayoutTests/svg/custom/use-rebuild-resources-crash.svg (rev 0)
+++ branches/chromium/1364/LayoutTests/svg/custom/use-rebuild-resources-crash.svg 2013-01-14 22:11:30 UTC (rev 139661)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<svg id="svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+ <!-- Test for https://bugs.webkit.org/show_bug.cgi?id=106664 -->
+ <defs>
+ <symbol id="s1">
+ <use/>
+ <rect id="r1"/>
+ </symbol>
+
+ <use id="u1" xlink:href=""
+
+ <style>
+ use { clip-path: url(#r1); }
+ </style>
+ </defs>
+
+ <text>PASS: Did not crash.</text>
+
+ <script>
+ function initCF() {
+ u1 = document.getElementById('u1');
+ clone = u1.cloneNode(false);
+ document.getElementById('svg').appendChild(clone);
+ }
+
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ document.addEventListener("DOMContentLoaded", initCF, false);
+ </script>
+</svg>
Modified: branches/chromium/1364/Source/WebCore/svg/SVGStyledElement.cpp (139660 => 139661)
--- branches/chromium/1364/Source/WebCore/svg/SVGStyledElement.cpp 2013-01-14 21:45:58 UTC (rev 139660)
+++ branches/chromium/1364/Source/WebCore/svg/SVGStyledElement.cpp 2013-01-14 22:11:30 UTC (rev 139661)
@@ -356,7 +356,7 @@
void SVGStyledElement::buildPendingResourcesIfNeeded()
{
Document* document = this->document();
- if (!needsPendingResourceHandling() || !document)
+ if (!needsPendingResourceHandling() || !document || !inDocument() || isInShadowTree())
return;
SVGDocumentExtensions* extensions = document->accessSVGExtensions();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
