Oilpan: Remove WillBe types (part 9)

third_party/WebKit/Source/core/events/EventPath.h

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 26 matching lines @@
 
 namespace blink {
 
 class Event;
 class EventTarget;
 class Node;
 class TouchEvent;
 class TouchList;
 class TreeScope;
 
-class CORE_EXPORT EventPath final : public NoBaseWillBeGarbageCollectedFinalized<EventPath> {
-    USING_FAST_MALLOC_WILL_BE_REMOVED(EventPath);
+class CORE_EXPORT EventPath final : public GarbageCollectedFinalized<EventPath> {
     WTF_MAKE_NONCOPYABLE(EventPath);
 public:
     explicit EventPath(Node&, Event* = nullptr);
 
     void initializeWith(Node&, Event*);
 
     NodeEventContext& operator[](size_t index) { return m_nodeEventContexts[index]; }
     const NodeEventContext& operator[](size_t index) const { return m_nodeEventContexts[index]; }
     NodeEventContext& at(size_t index) { return m_nodeEventContexts[index]; }
     NodeEventContext& last() { return m_nodeEventContexts[size() - 1]; }
@@ skipping 20 matching lines @@
     EventPath();
 
     void initialize();
     void calculatePath();
     void calculateAdjustedTargets();
     void calculateTreeOrderAndSetNearestAncestorClosedTree();
 
     void shrink(size_t newSize) { ASSERT(!m_windowEventContext); m_nodeEventContexts.shrink(newSize); }
     void shrinkIfNeeded(const Node& target, const EventTarget& relatedTarget);
 
-    void adjustTouchList(const TouchList*, WillBeHeapVector<RawPtrWillBeMember<TouchList>> adjustedTouchList, const WillBeHeapVector<RawPtrWillBeMember<TreeScope>>& treeScopes);
+    void adjustTouchList(const TouchList*, HeapVector<Member<TouchList>> adjustedTouchList, const HeapVector<Member<TreeScope>>& treeScopes);
 
-    using TreeScopeEventContextMap = WillBeHeapHashMap<RawPtrWillBeMember<TreeScope>, RefPtrWillBeMember<TreeScopeEventContext>>;
+    using TreeScopeEventContextMap = HeapHashMap<Member<TreeScope>, Member<TreeScopeEventContext>>;
     TreeScopeEventContext* ensureTreeScopeEventContext(Node* currentTarget, TreeScope*, TreeScopeEventContextMap&);
 
-    using RelatedTargetMap = WillBeHeapHashMap<RawPtrWillBeMember<TreeScope>, RawPtrWillBeMember<EventTarget>>;
+    using RelatedTargetMap = HeapHashMap<Member<TreeScope>, Member<EventTarget>>;
 
     static void buildRelatedNodeMap(const Node&, RelatedTargetMap&);
     static EventTarget* findRelatedNode(TreeScope&, RelatedTargetMap&);
 
 #if ENABLE(ASSERT)
     static void checkReachability(TreeScope&, TouchList&);
 #endif
 
     const NodeEventContext& topNodeEventContext();
 
-    WillBeHeapVector<NodeEventContext> m_nodeEventContexts;
-    RawPtrWillBeMember<Node> m_node;
-    RawPtrWillBeMember<Event> m_event;
-    WillBeHeapVector<RefPtrWillBeMember<TreeScopeEventContext>> m_treeScopeEventContexts;
-    OwnPtrWillBeMember<WindowEventContext> m_windowEventContext;
+    HeapVector<NodeEventContext> m_nodeEventContexts;
+    Member<Node> m_node;
+    Member<Event> m_event;
+    HeapVector<Member<TreeScopeEventContext>> m_treeScopeEventContexts;
+    Member<WindowEventContext> m_windowEventContext;
 };
 
 } // namespace blink
 
 #endif