Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.h

 /*
  * Copyright (C) 2010 Google, Inc. All Rights Reserved.
  * Copyright (C) 2011 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 54 matching lines @@
 
     ContainerNode* oldParent()
     {
         // It's sort of ugly, but we store the |oldParent| in the |child| field
         // of the task so that we don't bloat the HTMLConstructionSiteTask
         // object in the common case of the Insert operation.
         return toContainerNode(child.get());
     }
 
     Operation operation;
-    RefPtrWillBeMember<ContainerNode> parent;
-    RefPtrWillBeMember<Node> nextChild;
-    RefPtrWillBeMember<Node> child;
+    Member<ContainerNode> parent;
+    Member<Node> nextChild;
+    Member<Node> child;
     bool selfClosing;
 };
 
 } // namespace blink
 
 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::HTMLConstructionSiteTask);
 
 namespace blink {
 
 // Note: These are intentionally ordered so that when we concatonate
@@ skipping 73 matching lines @@
     void insertHTMLBodyStartTagInBody(AtomicHTMLToken*);
 
     void reparent(HTMLElementStack::ElementRecord* newParent, HTMLElementStack::ElementRecord* child);
     void reparent(HTMLElementStack::ElementRecord* newParent, HTMLStackItem* child);
     // insertAlreadyParsedChild assumes that |child| has already been parsed (i.e., we're just
     // moving it around in the tree rather than parsing it for the first time). That means
     // this function doesn't call beginParsingChildren / finishParsingChildren.
     void insertAlreadyParsedChild(HTMLStackItem* newParent, HTMLElementStack::ElementRecord* child);
     void takeAllChildren(HTMLStackItem* newParent, HTMLElementStack::ElementRecord* oldParent);
 
-    PassRefPtrWillBeRawPtr<HTMLStackItem> createElementFromSavedToken(HTMLStackItem*);
+    RawPtr<HTMLStackItem> createElementFromSavedToken(HTMLStackItem*);
 
     bool shouldFosterParent() const;
-    void fosterParent(PassRefPtrWillBeRawPtr<Node>);
+    void fosterParent(RawPtr<Node>);
 
     bool indexOfFirstUnopenFormattingElement(unsigned& firstUnopenElementIndex) const;
     void reconstructTheActiveFormattingElements();
 
     void generateImpliedEndTags();
     void generateImpliedEndTagsWithExclusion(const AtomicString& tagName);
 
     bool inQuirksMode();
 
     bool isEmpty() const { return !m_openElements.stackDepth(); }
     HTMLElementStack::ElementRecord* currentElementRecord() const { return m_openElements.topRecord(); }
     Element* currentElement() const { return m_openElements.top(); }
     ContainerNode* currentNode() const { return m_openElements.topNode(); }
     HTMLStackItem* currentStackItem() const { return m_openElements.topStackItem(); }
     HTMLStackItem* oneBelowTop() const { return m_openElements.oneBelowTop(); }
     Document& ownerDocumentForCurrentNode();
     HTMLElementStack* openElements() const { return &m_openElements; }
     HTMLFormattingElementList* activeFormattingElements() const { return &m_activeFormattingElements; }
     bool currentIsRootNode() { return m_openElements.topNode() == m_openElements.rootNode(); }
 
     Element* head() const { return m_head->element(); }
     HTMLStackItem* headStackItem() const { return m_head.get(); }
 
     void setForm(HTMLFormElement*);
     HTMLFormElement* form() const { return m_form.get(); }
-    PassRefPtrWillBeRawPtr<HTMLFormElement> takeForm();
+    RawPtr<HTMLFormElement> takeForm();
 
     ParserContentPolicy getParserContentPolicy() { return m_parserContentPolicy; }
 
     class RedirectToFosterParentGuard {
         STACK_ALLOCATED();
         WTF_MAKE_NONCOPYABLE(RedirectToFosterParentGuard);
     public:
         RedirectToFosterParentGuard(HTMLConstructionSite& tree)
             : m_tree(tree)
             , m_wasRedirectingBefore(tree.m_redirectAttachToFosterParent)
         {
             m_tree.m_redirectAttachToFosterParent = true;
         }
 
         ~RedirectToFosterParentGuard()
         {
             m_tree.m_redirectAttachToFosterParent = m_wasRedirectingBefore;
         }
 
     private:
         HTMLConstructionSite& m_tree;
         bool m_wasRedirectingBefore;
     };
 
 private:
     // In the common case, this queue will have only one task because most
     // tokens produce only one DOM mutation.
-    typedef WillBeHeapVector<HTMLConstructionSiteTask, 1> TaskQueue;
+    typedef HeapVector<HTMLConstructionSiteTask, 1> TaskQueue;
 
     void setCompatibilityMode(Document::CompatibilityMode);
     void setCompatibilityModeFromDoctype(const String& name, const String& publicId, const String& systemId);
 
-    void attachLater(ContainerNode* parent, PassRefPtrWillBeRawPtr<Node> child, bool selfClosing = false);
+    void attachLater(ContainerNode* parent, RawPtr<Node> child, bool selfClosing = false);
 
     void findFosterSite(HTMLConstructionSiteTask&);
 
-    PassRefPtrWillBeRawPtr<HTMLElement> createHTMLElement(AtomicHTMLToken*);
-    PassRefPtrWillBeRawPtr<Element> createElement(AtomicHTMLToken*, const AtomicString& namespaceURI);
+    RawPtr<HTMLElement> createHTMLElement(AtomicHTMLToken*);
+    RawPtr<Element> createElement(AtomicHTMLToken*, const AtomicString& namespaceURI);
 
     void mergeAttributesFromTokenIntoElement(AtomicHTMLToken*, Element*);
     void dispatchDocumentElementAvailableIfNeeded();
 
     void executeTask(HTMLConstructionSiteTask&);
     void queueTask(const HTMLConstructionSiteTask&);
 
-    RawPtrWillBeMember<Document> m_document;
+    Member<Document> m_document;
 
     // This is the root ContainerNode to which the parser attaches all newly
     // constructed nodes. It points to a DocumentFragment when parsing fragments
     // and a Document in all other cases.
-    RawPtrWillBeMember<ContainerNode> m_attachmentRoot;
+    Member<ContainerNode> m_attachmentRoot;
 
-    RefPtrWillBeMember<HTMLStackItem> m_head;
-    RefPtrWillBeMember<HTMLFormElement> m_form;
+    Member<HTMLStackItem> m_head;
+    Member<HTMLFormElement> m_form;
     mutable HTMLElementStack m_openElements;
     mutable HTMLFormattingElementList m_activeFormattingElements;
 
     TaskQueue m_taskQueue;
 
     class PendingText final {
         DISALLOW_NEW();
     public:
         PendingText()
             : whitespaceMode(WhitespaceUnknown)
         {
         }
 
-        void append(PassRefPtrWillBeRawPtr<ContainerNode> newParent, PassRefPtrWillBeRawPtr<Node> newNextChild, const String& newString, WhitespaceMode newWhitespaceMode)
+        void append(RawPtr<ContainerNode> newParent, RawPtr<Node> newNextChild, const String& newString, WhitespaceMode newWhitespaceMode)
         {
             ASSERT(!parent || parent == newParent);
             parent = newParent;
             ASSERT(!nextChild || nextChild == newNextChild);
             nextChild = newNextChild;
             stringBuilder.append(newString);
             whitespaceMode = std::min(whitespaceMode, newWhitespaceMode);
         }
 
         void swap(PendingText& other)
@@ skipping 14 matching lines @@
         {
             // When the stringbuilder is empty, the parent and whitespace should also be "empty".
             ASSERT(stringBuilder.isEmpty() == !parent);
             ASSERT(!stringBuilder.isEmpty() || !nextChild);
             ASSERT(!stringBuilder.isEmpty() || (whitespaceMode == WhitespaceUnknown));
             return stringBuilder.isEmpty();
         }
 
         DECLARE_TRACE();
 
-        RefPtrWillBeMember<ContainerNode> parent;
-        RefPtrWillBeMember<Node> nextChild;
+        Member<ContainerNode> parent;
+        Member<Node> nextChild;
         StringBuilder stringBuilder;
         WhitespaceMode whitespaceMode;
     };
 
     PendingText m_pendingText;
 
     ParserContentPolicy m_parserContentPolicy;
     bool m_isParsingFragment;
 
     // http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#parsing-main-intable
     // In the "in table" insertion mode, we sometimes get into a state where
     // "whenever a node would be inserted into the current node, it must instead
     // be foster parented."  This flag tracks whether we're in that state.
     bool m_redirectAttachToFosterParent;
 
     bool m_inQuirksMode;
 };
 
 } // namespace blink
 
 #endif