Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Unified Diff: third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.h
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.h b/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.h
index 90daa17cc48870da2a2beec34e3250490d86f489..4e73b79935ef796b123f957aa28e2bb73b10c7fd 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.h
+++ b/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.h
@@ -72,9 +72,9 @@ public:
}
Operation operation;
- RefPtrWillBeMember<ContainerNode> parent;
- RefPtrWillBeMember<Node> nextChild;
- RefPtrWillBeMember<Node> child;
+ Member<ContainerNode> parent;
+ Member<Node> nextChild;
+ Member<Node> child;
bool selfClosing;
};
@@ -168,10 +168,10 @@ public:
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();
@@ -197,7 +197,7 @@ public:
void setForm(HTMLFormElement*);
HTMLFormElement* form() const { return m_form.get(); }
- PassRefPtrWillBeRawPtr<HTMLFormElement> takeForm();
+ RawPtr<HTMLFormElement> takeForm();
ParserContentPolicy getParserContentPolicy() { return m_parserContentPolicy; }
@@ -225,17 +225,17 @@ public:
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();
@@ -243,15 +243,15 @@ private:
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;
@@ -265,7 +265,7 @@ private:
{
}
- 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;
@@ -300,8 +300,8 @@ private:
DECLARE_TRACE();
- RefPtrWillBeMember<ContainerNode> parent;
- RefPtrWillBeMember<Node> nextChild;
+ Member<ContainerNode> parent;
+ Member<Node> nextChild;
StringBuilder stringBuilder;
WhitespaceMode whitespaceMode;
};

Powered by Google App Engine
This is Rietveld 408576698