Changeset 118879 in webkit

Timestamp:

May 29, 2012, 6:57:59 PM (14 years ago)

Author:

cevans@google.com

Message:

Merge 117957
BUG=128342
Review URL: ​https://chromiumcodereview.appspot.com/10446075

Location:

branches/chromium/1132/Source/WebCore

Files:

• dom/EventDispatcher.cpp (modified) (1 diff)
• page/EventHandler.cpp (modified) (1 diff)

branches/chromium/1132/Source/WebCore/dom/EventDispatcher.cpp

@@ -67 +67 @@
     // as a deeply cloned child of the 'use' element, except that events are dispatched to the SVGElementInstance objects
     Element* shadowHostElement = referenceNode->treeScope()->rootNode()->shadowHost();
-    // At this time, SVG nodes are not allowed in non-<use> shadow trees, so any shadow root we do
-    // have should be a use. The assert and following test is here to catch future shadow DOM changes
-    // that do enable SVG in a shadow tree.
-    ASSERT(!shadowHostElement || shadowHostElement->hasTagName(SVGNames::useTag));
-    if (shadowHostElement && shadowHostElement->hasTagName(SVGNames::useTag)) {
-        SVGUseElement* useElement = static_cast<SVGUseElement*>(shadowHostElement);
-
-        if (SVGElementInstance* instance = useElement->instanceForShadowTreeElement(referenceNode))
-            return instance;
-    }
+    // At this time, SVG nodes are not supported in non-<use> shadow trees.
+    if (!shadowHostElement || !shadowHostElement->hasTagName(SVGNames::useTag))
+        return referenceNode;
+    SVGUseElement* useElement = static_cast<SVGUseElement*>(shadowHostElement);
+    if (SVGElementInstance* instance = useElement->instanceForShadowTreeElement(referenceNode))
+        return instance;
 #endif
 

branches/chromium/1132/Source/WebCore/page/EventHandler.cpp

@@ -2097 +2097 @@
 
     Element* shadowTreeParentElement = shadowTreeElement->shadowHost();
-    if (!shadowTreeParentElement)
+    if (!shadowTreeParentElement || !shadowTreeParentElement->hasTagName(useTag))
         return 0;
 
-    ASSERT(shadowTreeParentElement->hasTagName(useTag));
     return static_cast<SVGUseElement*>(shadowTreeParentElement)->instanceForShadowTreeElement(referenceNode);
 }