Title: [154289] trunk/Source/WebCore
Revision
154289
Author
[email protected]
Date
2013-08-19 12:34:25 -0700 (Mon, 19 Aug 2013)

Log Message

ASSERTION FAILED: !node || node->isShadowRoot() in WebCore::EventRetargeter::eventTargetRespectingTargetRules
https://bugs.webkit.org/show_bug.cgi?id=119720

Reviewed by Andy Estes.

Merge https://chromium.googlesource.com/chromium/blink/+/4ce9bfbf54410179cd0f18b3d1a912045fc0ec3d

* dom/EventRetargeter.h:
(WebCore::EventRetargeter::eventTargetRespectingTargetRules):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (154288 => 154289)


--- trunk/Source/WebCore/ChangeLog	2013-08-19 19:11:40 UTC (rev 154288)
+++ trunk/Source/WebCore/ChangeLog	2013-08-19 19:34:25 UTC (rev 154289)
@@ -1,3 +1,15 @@
+2013-08-19  Ryosuke Niwa  <[email protected]>
+
+        ASSERTION FAILED: !node || node->isShadowRoot() in WebCore::EventRetargeter::eventTargetRespectingTargetRules
+        https://bugs.webkit.org/show_bug.cgi?id=119720
+
+        Reviewed by Andy Estes.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/4ce9bfbf54410179cd0f18b3d1a912045fc0ec3d
+
+        * dom/EventRetargeter.h:
+        (WebCore::EventRetargeter::eventTargetRespectingTargetRules):
+
 2013-08-19  Darin Adler  <[email protected]>
 
         <https://webkit.org/b/120013> Tighten up logic in HTMLTableRowsCollection

Modified: trunk/Source/WebCore/dom/EventRetargeter.h (154288 => 154289)


--- trunk/Source/WebCore/dom/EventRetargeter.h	2013-08-19 19:11:40 UTC (rev 154288)
+++ trunk/Source/WebCore/dom/EventRetargeter.h	2013-08-19 19:34:25 UTC (rev 154289)
@@ -90,7 +90,8 @@
 
     // Spec: The event handling for the non-exposed tree works as if the referenced element had been textually included
     // as a deeply cloned child of the 'use' element, except that events are dispatched to the SVGElementInstance objects
-    Element* shadowHostElement = toShadowRoot(referenceNode->treeScope()->rootNode())->hostElement();
+    Node* rootNode = referenceNode->treeScope()->rootNode();
+    Element* shadowHostElement = rootNode->isShadowRoot() ? toShadowRoot(rootNode)->hostElement() : 0;
     // At this time, SVG nodes are not supported in non-<use> shadow trees.
     if (!shadowHostElement || !shadowHostElement->hasTagName(SVGNames::useTag))
         return referenceNode;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to