Oilpan: Remove most WillBe types from the code base

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011, 2013 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 48 matching lines @@
 
 enum SubtreeModificationAction {
     DispatchSubtreeModifiedEvent,
     OmitSubtreeModifiedEvent
 };
 
 // This constant controls how much buffer is initially allocated
 // for a Node Vector that is used to store child Nodes of a given Node.
 // FIXME: Optimize the value.
 const int initialNodeVectorSize = 11;
-using NodeVector = WillBeHeapVector<RefPtrWillBeMember<Node>, initialNodeVectorSize>;
+using NodeVector = HeapVector<Member<Node>, initialNodeVectorSize>;
 
 class CORE_EXPORT ContainerNode : public Node {
 public:
     ~ContainerNode() override;
 
     Node* firstChild() const { return m_firstChild; }
     Node* lastChild() const { return m_lastChild; }
     bool hasChildren() const { return m_firstChild; }
 
     bool hasOneChild() const { return m_firstChild && !m_firstChild->nextSibling(); }
     bool hasOneTextChild() const { return hasOneChild() && m_firstChild->isTextNode(); }
     bool hasChildCount(unsigned) const;
 
-    PassRefPtrWillBeRawPtr<HTMLCollection> children();
+    RawPtr<HTMLCollection> children();
 
     unsigned countChildren() const;
 
-    PassRefPtrWillBeRawPtr<Element> querySelector(const AtomicString& selectors, ExceptionState&);
-    PassRefPtrWillBeRawPtr<StaticElementList> querySelectorAll(const AtomicString& selectors, ExceptionState&);
+    RawPtr<Element> querySelector(const AtomicString& selectors, ExceptionState&);
+    RawPtr<StaticElementList> querySelectorAll(const AtomicString& selectors, ExceptionState&);
 
-    PassRefPtrWillBeRawPtr<Node> insertBefore(PassRefPtrWillBeRawPtr<Node> newChild, Node* refChild, ExceptionState& = ASSERT_NO_EXCEPTION);
-    PassRefPtrWillBeRawPtr<Node> replaceChild(PassRefPtrWillBeRawPtr<Node> newChild, PassRefPtrWillBeRawPtr<Node> oldChild, ExceptionState& = ASSERT_NO_EXCEPTION);
-    PassRefPtrWillBeRawPtr<Node> removeChild(PassRefPtrWillBeRawPtr<Node> child, ExceptionState& = ASSERT_NO_EXCEPTION);
-    PassRefPtrWillBeRawPtr<Node> appendChild(PassRefPtrWillBeRawPtr<Node> newChild, ExceptionState& = ASSERT_NO_EXCEPTION);
+    RawPtr<Node> insertBefore(RawPtr<Node> newChild, Node* refChild, ExceptionState& = ASSERT_NO_EXCEPTION);
+    RawPtr<Node> replaceChild(RawPtr<Node> newChild, RawPtr<Node> oldChild, ExceptionState& = ASSERT_NO_EXCEPTION);
+    RawPtr<Node> removeChild(RawPtr<Node> child, ExceptionState& = ASSERT_NO_EXCEPTION);
+    RawPtr<Node> appendChild(RawPtr<Node> newChild, ExceptionState& = ASSERT_NO_EXCEPTION);
 
     Element* getElementById(const AtomicString& id) const;
-    PassRefPtrWillBeRawPtr<TagCollection> getElementsByTagName(const AtomicString&);
-    PassRefPtrWillBeRawPtr<TagCollection> getElementsByTagNameNS(const AtomicString& namespaceURI, const AtomicString& localName);
-    PassRefPtrWillBeRawPtr<NameNodeList> getElementsByName(const AtomicString& elementName);
-    PassRefPtrWillBeRawPtr<ClassCollection> getElementsByClassName(const AtomicString& classNames);
-    PassRefPtrWillBeRawPtr<RadioNodeList> radioNodeList(const AtomicString&, bool onlyMatchImgElements = false);
+    RawPtr<TagCollection> getElementsByTagName(const AtomicString&);
+    RawPtr<TagCollection> getElementsByTagNameNS(const AtomicString& namespaceURI, const AtomicString& localName);
+    RawPtr<NameNodeList> getElementsByName(const AtomicString& elementName);
+    RawPtr<ClassCollection> getElementsByClassName(const AtomicString& classNames);
+    RawPtr<RadioNodeList> radioNodeList(const AtomicString&, bool onlyMatchImgElements = false);
 
     // These methods are only used during parsing.
     // They don't send DOM mutation events or accept DocumentFragments.
-    void parserAppendChild(PassRefPtrWillBeRawPtr<Node>);
+    void parserAppendChild(RawPtr<Node>);
     void parserRemoveChild(Node&);
-    void parserInsertBefore(PassRefPtrWillBeRawPtr<Node> newChild, Node& refChild);
+    void parserInsertBefore(RawPtr<Node> newChild, Node& refChild);
     void parserTakeAllChildrenFrom(ContainerNode&);
 
     void removeChildren(SubtreeModificationAction = DispatchSubtreeModifiedEvent);
 
     void cloneChildNodes(ContainerNode* clone);
 
     void attach(const AttachContext& = AttachContext()) override;
     void detach(const AttachContext& = AttachContext()) override;
     LayoutRect boundingBox() const final;
     void setFocus(bool) override;
@@ skipping 75 matching lines @@
                 byParser
             };
             return change;
         }
 
         bool isChildInsertion() const { return type == ElementInserted || type == NonElementInserted; }
         bool isChildRemoval() const { return type == ElementRemoved || type == NonElementRemoved; }
         bool isChildElementChange() const { return type == ElementInserted || type == ElementRemoved; }
 
         ChildrenChangeType type;
-        RawPtrWillBeMember<Node> siblingBeforeChange;
-        RawPtrWillBeMember<Node> siblingAfterChange;
+        Member<Node> siblingBeforeChange;
+        Member<Node> siblingAfterChange;
         ChildrenChangeSource byParser;
     };
 
     // Notifies the node that it's list of children have changed (either by adding or removing child nodes), or a child
     // node that is of the type CDATA_SECTION_NODE, TEXT_NODE or COMMENT_NODE has changed its value.
     virtual void childrenChanged(const ChildrenChange&);
 
     DECLARE_VIRTUAL_TRACE();
 
 protected:
     ContainerNode(TreeScope*, ConstructionType = CreateContainer);
 
     void invalidateNodeListCachesInAncestors(const QualifiedName* attrName = nullptr, Element* attributeOwnerElement = nullptr);
 
 #if !ENABLE(OILPAN)
     void removeDetachedChildren();
 #endif
 
     void setFirstChild(Node* child) { m_firstChild = child; }
     void setLastChild(Node* child) { m_lastChild = child; }
 
     // Utility functions for NodeListsNodeData API.
-    template <typename Collection> PassRefPtrWillBeRawPtr<Collection> ensureCachedCollection(CollectionType);
-    template <typename Collection> PassRefPtrWillBeRawPtr<Collection> ensureCachedCollection(CollectionType, const AtomicString& name);
-    template <typename Collection> PassRefPtrWillBeRawPtr<Collection> ensureCachedCollection(CollectionType, const AtomicString& namespaceURI, const AtomicString& localName);
+    template <typename Collection> RawPtr<Collection> ensureCachedCollection(CollectionType);
+    template <typename Collection> RawPtr<Collection> ensureCachedCollection(CollectionType, const AtomicString& name);
+    template <typename Collection> RawPtr<Collection> ensureCachedCollection(CollectionType, const AtomicString& namespaceURI, const AtomicString& localName);
     template <typename Collection> Collection* cachedCollection(CollectionType);
 
 private:
     bool isContainerNode() const = delete; // This will catch anyone doing an unnecessary check.
     bool isTextNode() const = delete; // This will catch anyone doing an unnecessary check.
 
     NodeListsNodeData& ensureNodeLists();
     void removeBetween(Node* previousChild, Node* nextChild, Node& oldChild);
     void insertBeforeCommon(Node& nextChild, Node& oldChild);
     void appendChildCommon(Node& child);
@@ skipping 15 matching lines @@
 
     inline bool checkAcceptChildGuaranteedNodeTypes(const Node& newChild, const Node* oldChild, ExceptionState&) const;
     inline bool checkAcceptChild(const Node* newChild, const Node* oldChild, ExceptionState&) const;
     inline bool checkParserAcceptChild(const Node& newChild) const;
     inline bool containsConsideringHostElements(const Node&) const;
     inline bool isChildTypeAllowed(const Node& child) const;
 
     bool getUpperLeftCorner(FloatPoint&) const;
     bool getLowerRightCorner(FloatPoint&) const;
 
-    RawPtrWillBeMember<Node> m_firstChild;
-    RawPtrWillBeMember<Node> m_lastChild;
+    Member<Node> m_firstChild;
+    Member<Node> m_lastChild;
 };
 
 #if ENABLE(ASSERT)
 bool childAttachedAllowedWhenAttachingChildren(ContainerNode*);
 #endif
 
 WILL_NOT_BE_EAGERLY_TRACED_CLASS(ContainerNode);
 
 DEFINE_NODE_TYPE_CASTS(ContainerNode, isContainerNode());
 
@@ skipping 62 matching lines @@
 inline void getChildNodes(ContainerNode& node, NodeVector& nodes)
 {
     ASSERT(!nodes.size());
     for (Node* child = node.firstChild(); child; child = child->nextSibling())
         nodes.append(child);
 }
 
 } // namespace blink
 
 #endif // ContainerNode_h