Title: [141148] branches/chromium/1364
- Revision
- 141148
- Author
- cev...@google.com
- Date
- 2013-01-29 12:55:43 -0800 (Tue, 29 Jan 2013)
Log Message
Merge 140520
BUG=170188
Review URL: https://codereview.chromium.org/12084050
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1364/LayoutTests/svg/custom/use-invalidate-click-crash-expected.txt (from rev 140520, trunk/LayoutTests/svg/custom/use-invalidate-click-crash-expected.txt) (0 => 141148)
--- branches/chromium/1364/LayoutTests/svg/custom/use-invalidate-click-crash-expected.txt (rev 0)
+++ branches/chromium/1364/LayoutTests/svg/custom/use-invalidate-click-crash-expected.txt 2013-01-29 20:55:43 UTC (rev 141148)
@@ -0,0 +1 @@
+PASS
Copied: branches/chromium/1364/LayoutTests/svg/custom/use-invalidate-click-crash.xhtml (from rev 140520, trunk/LayoutTests/svg/custom/use-invalidate-click-crash.xhtml) (0 => 141148)
--- branches/chromium/1364/LayoutTests/svg/custom/use-invalidate-click-crash.xhtml (rev 0)
+++ branches/chromium/1364/LayoutTests/svg/custom/use-invalidate-click-crash.xhtml 2013-01-29 20:55:43 UTC (rev 141148)
@@ -0,0 +1,32 @@
+<html>
+<body id="body">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+
+<symbol id="target">
+ <text font-size="172cm">YYYYYYYYY</text>
+</symbol>
+<use xlink:href=""
+
+<script><![CDATA[
+function keyDownMouseClick(x1, y1, x2, y2)
+{
+ if (!window.eventSender)
+ return;
+ eventSender.mouseDown();
+ eventSender.mouseMoveTo(x2, y2);
+ eventSender.mouseUp();
+}
+
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+var target = document.getElementById("target");
+keyDownMouseClick(333, 357, 155, 174);
+target.textContent = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
+keyDownMouseClick(115, 317, -16, -2);
+
+document.getElementById("body").textContent = "PASS"
+]]></script>
+</svg>
+</body>
+</html>
Modified: branches/chromium/1364/Source/WebCore/svg/SVGUseElement.cpp (141147 => 141148)
--- branches/chromium/1364/Source/WebCore/svg/SVGUseElement.cpp 2013-01-29 20:54:16 UTC (rev 141147)
+++ branches/chromium/1364/Source/WebCore/svg/SVGUseElement.cpp 2013-01-29 20:55:43 UTC (rev 141148)
@@ -400,7 +400,7 @@
{
// FIXME: We should try to optimize this, to at least allow partial reclones.
if (ShadowRoot* shadowTreeRootElement = shadow()->oldestShadowRoot())
- shadowTreeRootElement->removeAllChildren();
+ shadowTreeRootElement->removeChildren();
if (m_targetElementInstance) {
m_targetElementInstance->detach();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
