Fix for calculation of event.path for closed mode shadow root

Source/core/events/TreeScopeEventContext.h

Index: Source/core/events/TreeScopeEventContext.h
diff --git a/Source/core/events/TreeScopeEventContext.h b/Source/core/events/TreeScopeEventContext.h
index 1dad8e30b1dd75d03d917023319a9db258bdceab..e6d83651c5b569d2b04eba93d796ec1398616075 100644
--- a/Source/core/events/TreeScopeEventContext.h
+++ b/Source/core/events/TreeScopeEventContext.h
@@ -65,12 +65,18 @@ public:
 
     WillBeHeapVector<RefPtrWillBeMember<EventTarget>>& ensureEventPath(EventPath&);
 
-    bool isInclusiveAncestorOf(const TreeScopeEventContext&);
+    bool isInclusiveAncestorOf(const TreeScopeEventContext&) const;
+    bool isDescendantOf(const TreeScopeEventContext&) const;
+#if ENABLE(ASSERT)
+    bool isExclusivePartOf(const TreeScopeEventContext&) const;
+#endif
     void addChild(TreeScopeEventContext& child) { m_children.append(&child); }
 
-    // For ancestor-descendant relationship check in Q(1).
+    // For ancestor-descendant relationship check in O(1).
     // Preprocessing takes O(N).
-    int calculatePrePostOrderNumber(int orderNumber);
+    int calculateTreeOrderAndFindClosedTrees(int, TreeScopeEventContext*);

[hayato, 2015/08/25 01:34:20]

You shouldn't omit a parameter name for int.

calculateTreeOrderAndSetNearestAncestorClosedTree might be a better name.

[kochi, 2015/08/25 02:18:30]

Done.

+
+    TreeScopeEventContext* containingClosedShadowTree() const { return m_containingClosedShadowTree.get(); }
 
 private:
     TreeScopeEventContext(TreeScope&);
@@ -79,12 +85,15 @@ private:
     bool isUnreachableNode(EventTarget&);
 #endif
 
+    bool shouldIncludeTreeScope(const TreeScopeEventContext& other);

[hayato, 2015/08/25 01:34:20]

More descriptive name would be preferred. What 'Include' means here might be
unclear for readers.

[kochi, 2015/08/25 02:18:31]

How about shouldIncludeTreeScopeInEventPath?

+
     RawPtrWillBeMember<TreeScope> m_treeScope;
     RefPtrWillBeMember<Node> m_rootNode; // Prevents TreeScope from being freed. TreeScope itself isn't RefCounted.
     RefPtrWillBeMember<EventTarget> m_target;
     RefPtrWillBeMember<EventTarget> m_relatedTarget;
     OwnPtrWillBeMember<WillBeHeapVector<RefPtrWillBeMember<EventTarget>>> m_eventPath;
     RefPtrWillBeMember<TouchEventContext> m_touchEventContext;
+    RawPtrWillBeMember<TreeScopeEventContext> m_containingClosedShadowTree;
 
     WillBeHeapVector<RawPtrWillBeMember<TreeScopeEventContext>> m_children;
     int m_preOrder;
@@ -113,12 +122,27 @@ inline void TreeScopeEventContext::setRelatedTarget(PassRefPtrWillBeRawPtr<Event
     m_relatedTarget = relatedTarget;
 }
 
-inline bool TreeScopeEventContext::isInclusiveAncestorOf(const TreeScopeEventContext& other)
+inline bool TreeScopeEventContext::isInclusiveAncestorOf(const TreeScopeEventContext& other) const
 {
     ASSERT(m_preOrder != -1 && m_postOrder != -1 && other.m_preOrder != -1 && other.m_postOrder != -1);
     return m_preOrder <= other.m_preOrder && other.m_postOrder <= m_postOrder;
 }
 
+inline bool TreeScopeEventContext::isDescendantOf(const TreeScopeEventContext& other) const
+{
+    ASSERT(m_preOrder != -1 && m_postOrder != -1 && other.m_preOrder != -1 && other.m_postOrder != -1);
+    return other.m_preOrder < m_preOrder && m_postOrder < other.m_postOrder;
+}
+
+#if ENABLE(ASSERT)
+inline bool TreeScopeEventContext::isExclusivePartOf(const TreeScopeEventContext& other) const
+{
+    ASSERT(m_preOrder != -1 && m_postOrder != -1 && other.m_preOrder != -1 && other.m_postOrder != -1);
+    return (m_preOrder < other.m_preOrder && m_postOrder < other.m_preOrder)
+        || (m_preOrder > other.m_preOrder && m_preOrder > other.m_postOrder);
+}
+#endif
+
 }
 
 #endif // TreeScopeEventContext_h