Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/dom/TreeScope.h

 /*
  * Copyright (C) 2011 Google Inc. All Rights Reserved.
  * Copyright (C) 2012 Apple 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
@@ skipping 32 matching lines @@
 class HTMLLabelElement;
 class HTMLMapElement;
 class HitTestResult;
 class IdTargetObserverRegistry;
 class ScopedStyleResolver;
 class Node;
 
 // A class which inherits both Node and TreeScope must call clearRareData() in its destructor
 // so that the Node destructor no longer does problematic NodeList cache manipulation in
 // the destructor.
-class CORE_EXPORT TreeScope : public WillBeGarbageCollectedMixin {
+class CORE_EXPORT TreeScope : public GarbageCollectedMixin {
 public:
     TreeScope* parentTreeScope() const { return m_parentTreeScope; }
 
     TreeScope* olderShadowRootOrParentTreeScope() const;
     bool isInclusiveOlderSiblingShadowRootOrAncestorTreeScopeOf(const TreeScope&) const;
 
     Element* adjustedFocusedElement() const;
     Element* getElementById(const AtomicString&) const;
-    const WillBeHeapVector<RawPtrWillBeMember<Element>>& getAllElementsById(const AtomicString&) const;
+    const HeapVector<Member<Element>>& getAllElementsById(const AtomicString&) const;
     bool hasElementWithId(const AtomicString& id) const;
     bool containsMultipleElementsWithId(const AtomicString& id) const;
     void addElementById(const AtomicString& elementId, Element*);
     void removeElementById(const AtomicString& elementId, Element*);
 
     Document& document() const
     {
         ASSERT(m_document);
         return *m_document;
     }
 
     Node* ancestorInThisScope(Node*) const;
 
     void addImageMap(HTMLMapElement*);
     void removeImageMap(HTMLMapElement*);
     HTMLMapElement* getImageMap(const String& url) const;
 
     Element* elementFromPoint(int x, int y) const;
     Element* hitTestPoint(int x, int y, const HitTestRequest&) const;
-    WillBeHeapVector<RawPtrWillBeMember<Element>> elementsFromPoint(int x, int y) const;
-    WillBeHeapVector<RawPtrWillBeMember<Element>> elementsFromHitTestResult(HitTestResult&) const;
+    HeapVector<Member<Element>> elementsFromPoint(int x, int y) const;
+    HeapVector<Member<Element>> elementsFromHitTestResult(HitTestResult&) const;
 
     // For accessibility.
     bool shouldCacheLabelsByForAttribute() const { return m_labelsByForAttribute; }
     void addLabel(const AtomicString& forAttributeValue, HTMLLabelElement*);
     void removeLabel(const AtomicString& forAttributeValue, HTMLLabelElement*);
     HTMLLabelElement* labelElementForId(const AtomicString& forAttributeValue);
 
     DOMSelection* getSelection() const;
 
     // Find first anchor with the given name.
@@ skipping 80 matching lines @@
     bool deletionHasBegun();
     void beginDeletion();
 #else
     bool deletionHasBegun() { return false; }
     void beginDeletion() { }
 #endif
 #endif
 
     bool rootNodeHasTreeSharedParent() const;
 
-    RawPtrWillBeMember<ContainerNode> m_rootNode;
-    RawPtrWillBeMember<Document> m_document;
-    RawPtrWillBeMember<TreeScope> m_parentTreeScope;
+    Member<ContainerNode> m_rootNode;
+    Member<Document> m_document;
+    Member<TreeScope> m_parentTreeScope;
 
 #if !ENABLE(OILPAN)
     int m_guardRefCount;
 #endif
 
-    OwnPtrWillBeMember<DocumentOrderedMap> m_elementsById;
-    OwnPtrWillBeMember<DocumentOrderedMap> m_imageMapsByName;
-    OwnPtrWillBeMember<DocumentOrderedMap> m_labelsByForAttribute;
+    Member<DocumentOrderedMap> m_elementsById;
+    Member<DocumentOrderedMap> m_imageMapsByName;
+    Member<DocumentOrderedMap> m_labelsByForAttribute;
 
-    OwnPtrWillBeMember<IdTargetObserverRegistry> m_idTargetObserverRegistry;
+    Member<IdTargetObserverRegistry> m_idTargetObserverRegistry;
 
-    OwnPtrWillBeMember<ScopedStyleResolver> m_scopedStyleResolver;
+    Member<ScopedStyleResolver> m_scopedStyleResolver;
 
-    mutable RefPtrWillBeMember<DOMSelection> m_selection;
+    mutable Member<DOMSelection> m_selection;
 
     RadioButtonGroupScope m_radioButtonGroupScope;
 };
 
 inline bool TreeScope::hasElementWithId(const AtomicString& id) const
 {
     ASSERT(!id.isNull());
     return m_elementsById && m_elementsById->contains(id);
 }
 
 inline bool TreeScope::containsMultipleElementsWithId(const AtomicString& id) const
 {
     return m_elementsById && m_elementsById->containsMultiple(id);
 }
 
 DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES(TreeScope)
 
 HitTestResult hitTestInDocument(const Document*, int x, int y, const HitTestRequest& = HitTestRequest::ReadOnly | HitTestRequest::Active);
 
 } // namespace blink
 
 #endif // TreeScope_h