Oilpan: Remove most WillBe types from the code base

third_party/WebKit/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 27 matching lines @@
 namespace blink {
 
 class EventPath;
 class EventTarget;
 class Node;
 template <typename NodeType> class StaticNodeTypeList;
 using StaticNodeList = StaticNodeTypeList<Node>;
 class TouchEventContext;
 class TreeScope;
 
-class CORE_EXPORT TreeScopeEventContext final : public RefCountedWillBeGarbageCollected<TreeScopeEventContext> {
-    DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(TreeScopeEventContext);
+class CORE_EXPORT TreeScopeEventContext final : public GarbageCollected<TreeScopeEventContext> {
 public:
-    static PassRefPtrWillBeRawPtr<TreeScopeEventContext> create(TreeScope&);
+    static RawPtr<TreeScopeEventContext> create(TreeScope&);
     DECLARE_TRACE();
 
     TreeScope& treeScope() const { return *m_treeScope; }
     Node& rootNode() const { return *m_rootNode; }
 
     EventTarget* target() const { return m_target.get(); }
-    void setTarget(PassRefPtrWillBeRawPtr<EventTarget>);
+    void setTarget(RawPtr<EventTarget>);
 
     EventTarget* relatedTarget() const { return m_relatedTarget.get(); }
-    void setRelatedTarget(PassRefPtrWillBeRawPtr<EventTarget>);
+    void setRelatedTarget(RawPtr<EventTarget>);
 
     TouchEventContext* touchEventContext() const { return m_touchEventContext.get(); }
     TouchEventContext* ensureTouchEventContext();
 
-    WillBeHeapVector<RefPtrWillBeMember<EventTarget>>& ensureEventPath(EventPath&);
+    HeapVector<Member<EventTarget>>& ensureEventPath(EventPath&);
 
     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 O(1).
     // Preprocessing takes O(N).
     int calculateTreeOrderAndSetNearestAncestorClosedTree(int orderNumber, TreeScopeEventContext* nearestAncestorClosedTreeScopeEventContext);
 
     TreeScopeEventContext* containingClosedShadowTree() const { return m_containingClosedShadowTree.get(); }
 
 private:
     TreeScopeEventContext(TreeScope&);
 
 #if ENABLE(ASSERT)
     bool isUnreachableNode(EventTarget&);
 #endif
 
     bool isUnclosedTreeOf(const TreeScopeEventContext& other);
 
-    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;
+    Member<TreeScope> m_treeScope;
+    Member<Node> m_rootNode; // Prevents TreeScope from being freed. TreeScope itself isn't RefCounted.
+    Member<EventTarget> m_target;
+    Member<EventTarget> m_relatedTarget;
+    Member<HeapVector<Member<EventTarget>>> m_eventPath;
+    Member<TouchEventContext> m_touchEventContext;
+    Member<TreeScopeEventContext> m_containingClosedShadowTree;
 
-    WillBeHeapVector<RawPtrWillBeMember<TreeScopeEventContext>> m_children;
+    HeapVector<Member<TreeScopeEventContext>> m_children;
     int m_preOrder;
     int m_postOrder;
 };
 
 #if ENABLE(ASSERT)
 inline bool TreeScopeEventContext::isUnreachableNode(EventTarget& target)
 {
     // FIXME: Checks also for SVG elements.
     return target.toNode() && !target.toNode()->isSVGElement() && !target.toNode()->treeScope().isInclusiveOlderSiblingShadowRootOrAncestorTreeScopeOf(treeScope());
 }
 #endif
 
-inline void TreeScopeEventContext::setTarget(PassRefPtrWillBeRawPtr<EventTarget> target)
+inline void TreeScopeEventContext::setTarget(RawPtr<EventTarget> target)
 {
     ASSERT(target);
     ASSERT(!isUnreachableNode(*target));
     m_target = target;
 }
 
-inline void TreeScopeEventContext::setRelatedTarget(PassRefPtrWillBeRawPtr<EventTarget> relatedTarget)
+inline void TreeScopeEventContext::setRelatedTarget(RawPtr<EventTarget> relatedTarget)
 {
     ASSERT(relatedTarget);
     ASSERT(!isUnreachableNode(*relatedTarget));
     m_relatedTarget = relatedTarget;
 }
 
 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;
@@ skipping 10 matching lines @@
 {
     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
 
 } // namespace blink
 
 #endif // TreeScopeEventContext_h