Changeset 118890 in webkit

Timestamp:

May 29, 2012, 9:20:02 PM (14 years ago)

Author:

hayato@chromium.org

Message:

Introduces ComposedShadowTreeParentWalker, extracted from ComposedShadowTreeWalker.
​https://bugs.webkit.org/show_bug.cgi?id=87004

Reviewed by Dimitri Glazkov.

Introduces a ComposedShadowTreeParentWalker, which is only used
for traversing a parent node (including shadow roots and insertion
points) and get rid of an equivalent function from
ComposedShadowTreeWalker.

Before this patch, there is an inconsistency inside of
ComposedShadowTreeWalker. The Walker uses 'Policy' to decide
whether it should visit shadow roots or not, but
parentIncludingInsertionPointAndShadowRoot() member function
ignores the policy. We can not add an assertion in its
constructor due to this inconsistency. To resolve it, we could
add yet another special policy, but that makes the implementation
complex and may add some overhead in runtime. So separate the
functionality into another class as ComposedShadowTreeParentWalker.

No new tests, no new functionality except for assertion.

• dom/ComposedShadowTreeWalker.cpp:

(WebCore::ComposedShadowTreeWalker::ComposedShadowTreeWalker):
(WebCore::ComposedShadowTreeParentWalker::ComposedShadowTreeParentWalker):
(WebCore):
(WebCore::ComposedShadowTreeParentWalker::parentIncludingInsertionPointAndShadowRoot):
(WebCore::ComposedShadowTreeParentWalker::traverseParentIncludingInsertionPointAndShadowRoot):

• dom/ComposedShadowTreeWalker.h:

(ComposedShadowTreeWalker):
(WebCore::ComposedShadowTreeWalker::assertPrecondition):
(WebCore):
(ComposedShadowTreeParentWalker):
(WebCore::ComposedShadowTreeParentWalker::get):

• dom/EventDispatcher.cpp:

(WebCore::EventRelatedTargetAdjuster::adjust):
(WebCore::EventDispatcher::ensureEventAncestors):

• page/EventHandler.cpp:

(WebCore::EventHandler::updateMouseEventTargetNode):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ComposedShadowTreeWalker.cpp (modified) (3 diffs)
• dom/ComposedShadowTreeWalker.h (modified) (4 diffs)
• dom/EventDispatcher.cpp (modified) (2 diffs)
• page/EventHandler.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-29  Hayato Ito  <hayato@chromium.org>
+
+        Introduces ComposedShadowTreeParentWalker, extracted from ComposedShadowTreeWalker.
+        https://bugs.webkit.org/show_bug.cgi?id=87004
+
+        Reviewed by Dimitri Glazkov.
+
+        Introduces a ComposedShadowTreeParentWalker, which is only used
+        for traversing a parent node (including shadow roots and insertion
+        points) and get rid of an equivalent function from
+        ComposedShadowTreeWalker.
+
+        Before this patch, there is an inconsistency inside of
+        ComposedShadowTreeWalker. The Walker uses 'Policy' to decide
+        whether it should visit shadow roots or not, but
+        parentIncludingInsertionPointAndShadowRoot() member function
+        ignores the policy.  We can not add an assertion in its
+        constructor due to this inconsistency.  To resolve it, we could
+        add yet another special policy, but that makes the implementation
+        complex and may add some overhead in runtime.  So separate the
+        functionality into another class as ComposedShadowTreeParentWalker.
+
+        No new tests, no new functionality except for assertion.
+
+        * dom/ComposedShadowTreeWalker.cpp:
+        (WebCore::ComposedShadowTreeWalker::ComposedShadowTreeWalker):
+        (WebCore::ComposedShadowTreeParentWalker::ComposedShadowTreeParentWalker):
+        (WebCore):
+        (WebCore::ComposedShadowTreeParentWalker::parentIncludingInsertionPointAndShadowRoot):
+        (WebCore::ComposedShadowTreeParentWalker::traverseParentIncludingInsertionPointAndShadowRoot):
+        * dom/ComposedShadowTreeWalker.h:
+        (ComposedShadowTreeWalker):
+        (WebCore::ComposedShadowTreeWalker::assertPrecondition):
+        (WebCore):
+        (ComposedShadowTreeParentWalker):
+        (WebCore::ComposedShadowTreeParentWalker::get):
+        * dom/EventDispatcher.cpp:
+        (WebCore::EventRelatedTargetAdjuster::adjust):
+        (WebCore::EventDispatcher::ensureEventAncestors):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::updateMouseEventTargetNode):
+
 2012-05-29  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebCore/dom/ComposedShadowTreeWalker.cpp

@@ -53 +53 @@
     , m_policy(policy)
 {
-    // FIXME: Refactor ComposedShadowTreeWalker so that we can assert node here.
-    // https://bugs.webkit.org/show_bug.cgi?id=87004
+#ifndef NDEBUG
+    if (m_node)
+        assertPrecondition();
+#endif
 }
 
@@ -199 +201 @@
 }
 
-void ComposedShadowTreeWalker::parentIncludingInsertionPointAndShadowRoot()
-{
-    ASSERT(m_node);
-    m_node = traverseParentIncludingInsertionPointAndShadowRoot(m_node);
-}
-
-Node* ComposedShadowTreeWalker::traverseParentIncludingInsertionPointAndShadowRoot(const Node* node) const
-{
-    if (ElementShadow* shadow = shadowOfParent(node)) {
-        if (InsertionPoint* insertionPoint = shadow->insertionPointFor(node))
-            return insertionPoint;
-    }
-    if (!node->isShadowRoot())
-        return node->parentNode();
-    const ShadowRoot* shadowRoot = toShadowRoot(node);
-    if (shadowRoot->isYoungest())
-        return shadowRoot->host();
-    InsertionPoint* assignedInsertionPoint = shadowRoot->assignedTo();
-    ASSERT(assignedInsertionPoint);
-    return assignedInsertionPoint;
-}
-
 Node* ComposedShadowTreeWalker::traverseParent(const Node* node) const
 {
@@ -294 +274 @@
 }
 
+ComposedShadowTreeParentWalker::ComposedShadowTreeParentWalker(const Node* node)
+    : m_node(node)
+{
+}
+
+void ComposedShadowTreeParentWalker::parentIncludingInsertionPointAndShadowRoot()
+{
+    ASSERT(m_node);
+    m_node = traverseParentIncludingInsertionPointAndShadowRoot(m_node);
+}
+
+Node* ComposedShadowTreeParentWalker::traverseParentIncludingInsertionPointAndShadowRoot(const Node* node) const
+{
+    if (ElementShadow* shadow = shadowOfParent(node)) {
+        if (InsertionPoint* insertionPoint = shadow->insertionPointFor(node))
+            return insertionPoint;
+    }
+    if (!node->isShadowRoot())
+        return node->parentNode();
+    const ShadowRoot* shadowRoot = toShadowRoot(node);
+    if (shadowRoot->isYoungest())
+        return shadowRoot->host();
+    InsertionPoint* assignedInsertionPoint = shadowRoot->assignedTo();
+    ASSERT(assignedInsertionPoint);
+    return assignedInsertionPoint;
+}
+
 } // namespace

trunk/Source/WebCore/dom/ComposedShadowTreeWalker.h

@@ -60 +60 @@
 
     void parent();
-    // This function ignores policy and always crosses an upper boundary.
-    void parentIncludingInsertionPointAndShadowRoot();
 
     void next();
@@ -82 +80 @@
         else
             ASSERT(!m_node->isShadowRoot() || toShadowRoot(m_node)->isYoungest());
-        ASSERT(!isInsertionPoint(m_node) || !toInsertionPoint(m_node)->isActive());
+        ASSERT(!isActiveInsertionPoint(m_node));
 #endif
     }
@@ -101 +99 @@
     Node* traverseChild(const Node*, TraversalDirection) const;
     Node* traverseParent(const Node*) const;
-    Node* traverseParentIncludingInsertionPointAndShadowRoot(const Node*) const;
 
     static Node* traverseNextSibling(const Node*);
@@ -120 +117 @@
 };
 
+// A special walker class which is only used for traversing a parent node, including
+// insertion points and shadow roots.
+class ComposedShadowTreeParentWalker {
+public:
+    ComposedShadowTreeParentWalker(const Node*);
+    void parentIncludingInsertionPointAndShadowRoot();
+    Node* get() const { return const_cast<Node*>(m_node); }
+private:
+    Node* traverseParentIncludingInsertionPointAndShadowRoot(const Node*) const;
+    const Node* m_node;
+};
+
 } // namespace
 

trunk/Source/WebCore/dom/EventDispatcher.cpp

@@ -63 +63 @@
 {
     TreeScope* lastTreeScope = 0;
-    for (ComposedShadowTreeWalker walker(m_relatedTarget.get()); walker.get(); walker.parentIncludingInsertionPointAndShadowRoot()) {
+    for (ComposedShadowTreeParentWalker walker(m_relatedTarget.get()); walker.get(); walker.parentIncludingInsertionPointAndShadowRoot()) {
         TreeScope* scope = walker.get()->treeScope();
         // Skips adding a node to the map if treeScope does not change.
@@ -204 +204 @@
     bool isSVGElement = m_node->isSVGElement();
     Vector<EventTarget*> targetStack;
-    for (ComposedShadowTreeWalker walker(m_node.get()); walker.get(); walker.parentIncludingInsertionPointAndShadowRoot()) {
+    for (ComposedShadowTreeParentWalker walker(m_node.get()); walker.get(); walker.parentIncludingInsertionPointAndShadowRoot()) {
         Node* node = walker.get();
         if (isActiveInsertionPoint(node) || targetStack.isEmpty())

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2119 +2119 @@
         // If the target node is a text node, dispatch on the parent node - rdar://4196646
         if (result && result->isTextNode()) {
-            ComposedShadowTreeWalker walker(result);
+            ComposedShadowTreeParentWalker walker(result);
             walker.parentIncludingInsertionPointAndShadowRoot();
             result = walker.get();