Oilpan: Improve Oilpan support in EventContext and EventPath.

Source/core/events/TreeScopeEventContext.h

 /*
  * Copyright (C) 2014 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 25 matching lines @@
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
 class EventPath;
 class EventTarget;
 class Node;
 class TouchEventContext;
 class TreeScope;
 
-class TreeScopeEventContext : public RefCounted<TreeScopeEventContext> {
+class TreeScopeEventContext : public RefCountedWillBeGarbageCollected<TreeScopeEventContext> {

[haraken, 2014/06/12 05:51:43]

Add FINAL.

[tkent, 2014/06/12 06:24:48]

Done.

+    DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(TreeScopeEventContext);
 public:
-    static PassRefPtr<TreeScopeEventContext> create(TreeScope&);
-    ~TreeScopeEventContext();
+    static PassRefPtrWillBeRawPtr<TreeScopeEventContext> create(TreeScope&);
+    void trace(Visitor*);
 
-    TreeScope& treeScope() const { return m_treeScope; }
+    TreeScope& treeScope() const { return *m_treeScope; }
 
     EventTarget* target() const { return m_target.get(); }
     void setTarget(PassRefPtrWillBeRawPtr<EventTarget>);
 
     EventTarget* relatedTarget() const { return m_relatedTarget.get(); }
     void setRelatedTarget(PassRefPtrWillBeRawPtr<EventTarget>);
 
     TouchEventContext* touchEventContext() const { return m_touchEventContext.get(); }
     TouchEventContext* ensureTouchEventContext();
 
     PassRefPtrWillBeRawPtr<NodeList> ensureEventPath(EventPath&);
 
     bool isInclusiveAncestorOf(const TreeScopeEventContext&);
     void addChild(TreeScopeEventContext& child) { m_children.append(&child); }
 
     // For ancestor-descendant relationship check in Q(1).
     // Preprocessing takes O(N).
     int calculatePrePostOrderNumber(int orderNumber);
 
 private:
     TreeScopeEventContext(TreeScope&);
 
 #ifndef NDEBUG
     bool isUnreachableNode(EventTarget&);
 #endif
 
-    TreeScope& m_treeScope;
-    RefPtrWillBePersistent<EventTarget> m_target;
-    RefPtrWillBePersistent<EventTarget> m_relatedTarget;
-    RefPtrWillBePersistent<NodeList> m_eventPath;
-    RefPtrWillBePersistent<TouchEventContext> m_touchEventContext;
+    RawPtrWillBeMember<TreeScope> m_treeScope;
+    RefPtrWillBeMember<EventTarget> m_target;
+    RefPtrWillBeMember<EventTarget> m_relatedTarget;
+    RefPtrWillBeMember<NodeList> m_eventPath;
+    RefPtrWillBeMember<TouchEventContext> m_touchEventContext;
 
-    Vector<TreeScopeEventContext*> m_children;
+    WillBeHeapVector<RawPtrWillBeMember<TreeScopeEventContext> > m_children;
     int m_preOrder;
     int m_postOrder;
 };
 
 #ifndef NDEBUG
 inline bool TreeScopeEventContext::isUnreachableNode(EventTarget& target)
 {
     // FIXME: Checks also for SVG elements.
-    return target.toNode() && !target.toNode()->isSVGElement() && !target.toNode()->treeScope().isInclusiveOlderSiblingShadowRootOrAncestorTreeScopeOf(m_treeScope);
+    return target.toNode() && !target.toNode()->isSVGElement() && !target.toNode()->treeScope().isInclusiveOlderSiblingShadowRootOrAncestorTreeScopeOf(treeScope());
 }
 #endif
 
 inline void TreeScopeEventContext::setTarget(PassRefPtrWillBeRawPtr<EventTarget> target)
 {
     ASSERT(target);
     ASSERT(!isUnreachableNode(*target));
     m_target = target;
 }
 
 inline void TreeScopeEventContext::setRelatedTarget(PassRefPtrWillBeRawPtr<EventTarget> relatedTarget)
 {
     ASSERT(relatedTarget);
     ASSERT(!isUnreachableNode(*relatedTarget));
     m_relatedTarget = relatedTarget;
 }
 
 inline bool TreeScopeEventContext::isInclusiveAncestorOf(const TreeScopeEventContext& other)
 {
     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;
 }
 
 }
 
 #endif // TreeScopeEventContext_h