| Index: third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp b/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp
|
| index 0f4ba01201e469582d8f1d3510d16bdac28ad9bd..2d9123887d8a670585479a129d2f14055cd6ceca 100644
|
| --- a/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp
|
| +++ b/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp
|
| @@ -271,7 +271,7 @@ void HTMLConstructionSite::queueTask(const HTMLConstructionSiteTask& task)
|
| m_taskQueue.append(task);
|
| }
|
|
|
| -void HTMLConstructionSite::attachLater(ContainerNode* parent, PassRefPtrWillBeRawPtr<Node> prpChild, bool selfClosing)
|
| +void HTMLConstructionSite::attachLater(ContainerNode* parent, RawPtr<Node> prpChild, bool selfClosing)
|
| {
|
| ASSERT(scriptingContentIsAllowed(m_parserContentPolicy) || !prpChild.get()->isElementNode() || !toScriptLoaderIfPossible(toElement(prpChild.get())));
|
| ASSERT(pluginContentIsAllowed(m_parserContentPolicy) || !isHTMLPlugInElement(prpChild));
|
| @@ -374,7 +374,7 @@ void HTMLConstructionSite::setForm(HTMLFormElement* form)
|
| m_form = form;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<HTMLFormElement> HTMLConstructionSite::takeForm()
|
| +RawPtr<HTMLFormElement> HTMLConstructionSite::takeForm()
|
| {
|
| return m_form.release();
|
| }
|
| @@ -392,7 +392,7 @@ void HTMLConstructionSite::dispatchDocumentElementAvailableIfNeeded()
|
| void HTMLConstructionSite::insertHTMLHtmlStartTagBeforeHTML(AtomicHTMLToken* token)
|
| {
|
| ASSERT(m_document);
|
| - RefPtrWillBeRawPtr<HTMLHtmlElement> element = HTMLHtmlElement::create(*m_document);
|
| + RawPtr<HTMLHtmlElement> element = HTMLHtmlElement::create(*m_document);
|
| setAttributes(element.get(), token, m_parserContentPolicy);
|
| attachLater(m_attachmentRoot, element);
|
| m_openElements.pushHTMLHtmlElement(HTMLStackItem::create(element, token));
|
| @@ -551,7 +551,7 @@ void HTMLConstructionSite::insertDoctype(AtomicHTMLToken* token)
|
|
|
| const String& publicId = StringImpl::create8BitIfPossible(token->publicIdentifier());
|
| const String& systemId = StringImpl::create8BitIfPossible(token->systemIdentifier());
|
| - RefPtrWillBeRawPtr<DocumentType> doctype = DocumentType::create(m_document, token->name(), publicId, systemId);
|
| + RawPtr<DocumentType> doctype = DocumentType::create(m_document, token->name(), publicId, systemId);
|
| attachLater(m_attachmentRoot, doctype.release());
|
|
|
| // DOCTYPE nodes are only processed when parsing fragments w/o contextElements, which
|
| @@ -601,7 +601,7 @@ void HTMLConstructionSite::insertHTMLHeadElement(AtomicHTMLToken* token)
|
| void HTMLConstructionSite::insertHTMLBodyElement(AtomicHTMLToken* token)
|
| {
|
| ASSERT(!shouldFosterParent());
|
| - RefPtrWillBeRawPtr<HTMLElement> body = createHTMLElement(token);
|
| + RawPtr<HTMLElement> body = createHTMLElement(token);
|
| attachLater(currentNode(), body);
|
| m_openElements.pushHTMLBodyElement(HTMLStackItem::create(body.release(), token));
|
| if (m_document && m_document->frame())
|
| @@ -610,7 +610,7 @@ void HTMLConstructionSite::insertHTMLBodyElement(AtomicHTMLToken* token)
|
|
|
| void HTMLConstructionSite::insertHTMLFormElement(AtomicHTMLToken* token, bool isDemoted)
|
| {
|
| - RefPtrWillBeRawPtr<HTMLElement> element = createHTMLElement(token);
|
| + RawPtr<HTMLElement> element = createHTMLElement(token);
|
| ASSERT(isHTMLFormElement(element));
|
| m_form = static_pointer_cast<HTMLFormElement>(element.release());
|
| m_form->setDemoted(isDemoted);
|
| @@ -620,7 +620,7 @@ void HTMLConstructionSite::insertHTMLFormElement(AtomicHTMLToken* token, bool is
|
|
|
| void HTMLConstructionSite::insertHTMLElement(AtomicHTMLToken* token)
|
| {
|
| - RefPtrWillBeRawPtr<HTMLElement> element = createHTMLElement(token);
|
| + RawPtr<HTMLElement> element = createHTMLElement(token);
|
| attachLater(currentNode(), element);
|
| m_openElements.push(HTMLStackItem::create(element.release(), token));
|
| }
|
| @@ -654,7 +654,7 @@ void HTMLConstructionSite::insertScriptElement(AtomicHTMLToken* token)
|
| // those flags or effects thereof.
|
| const bool parserInserted = m_parserContentPolicy != AllowScriptingContentAndDoNotMarkAlreadyStarted;
|
| const bool alreadyStarted = m_isParsingFragment && parserInserted;
|
| - RefPtrWillBeRawPtr<HTMLScriptElement> element = HTMLScriptElement::create(ownerDocumentForCurrentNode(), parserInserted, alreadyStarted);
|
| + RawPtr<HTMLScriptElement> element = HTMLScriptElement::create(ownerDocumentForCurrentNode(), parserInserted, alreadyStarted);
|
| setAttributes(element.get(), token, m_parserContentPolicy);
|
| if (scriptingContentIsAllowed(m_parserContentPolicy))
|
| attachLater(currentNode(), element);
|
| @@ -666,7 +666,7 @@ void HTMLConstructionSite::insertForeignElement(AtomicHTMLToken* token, const At
|
| ASSERT(token->type() == HTMLToken::StartTag);
|
| DVLOG(1) << "Not implemented."; // parseError when xmlns or xmlns:xlink are wrong.
|
|
|
| - RefPtrWillBeRawPtr<Element> element = createElement(token, namespaceURI);
|
| + RawPtr<Element> element = createElement(token, namespaceURI);
|
| if (scriptingContentIsAllowed(m_parserContentPolicy) || !toScriptLoaderIfPossible(element.get()))
|
| attachLater(currentNode(), element, token->selfClosing());
|
| if (!token->selfClosing())
|
| @@ -730,10 +730,10 @@ void HTMLConstructionSite::takeAllChildren(HTMLStackItem* newParent, HTMLElement
|
| queueTask(task);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<Element> HTMLConstructionSite::createElement(AtomicHTMLToken* token, const AtomicString& namespaceURI)
|
| +RawPtr<Element> HTMLConstructionSite::createElement(AtomicHTMLToken* token, const AtomicString& namespaceURI)
|
| {
|
| QualifiedName tagName(nullAtom, token->name(), namespaceURI);
|
| - RefPtrWillBeRawPtr<Element> element = ownerDocumentForCurrentNode().createElement(tagName, true);
|
| + RawPtr<Element> element = ownerDocumentForCurrentNode().createElement(tagName, true);
|
| setAttributes(element.get(), token, m_parserContentPolicy);
|
| return element.release();
|
| }
|
| @@ -745,7 +745,7 @@ inline Document& HTMLConstructionSite::ownerDocumentForCurrentNode()
|
| return currentNode()->document();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<HTMLElement> HTMLConstructionSite::createHTMLElement(AtomicHTMLToken* token)
|
| +RawPtr<HTMLElement> HTMLConstructionSite::createHTMLElement(AtomicHTMLToken* token)
|
| {
|
| Document& document = ownerDocumentForCurrentNode();
|
| // Only associate the element with the current form if we're creating the new element
|
| @@ -754,14 +754,14 @@ PassRefPtrWillBeRawPtr<HTMLElement> HTMLConstructionSite::createHTMLElement(Atom
|
| // FIXME: This can't use HTMLConstructionSite::createElement because we
|
| // have to pass the current form element. We should rework form association
|
| // to occur after construction to allow better code sharing here.
|
| - RefPtrWillBeRawPtr<HTMLElement> element = HTMLElementFactory::createHTMLElement(token->name(), document, form, true);
|
| + RawPtr<HTMLElement> element = HTMLElementFactory::createHTMLElement(token->name(), document, form, true);
|
| setAttributes(element.get(), token, m_parserContentPolicy);
|
| return element.release();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<HTMLStackItem> HTMLConstructionSite::createElementFromSavedToken(HTMLStackItem* item)
|
| +RawPtr<HTMLStackItem> HTMLConstructionSite::createElementFromSavedToken(HTMLStackItem* item)
|
| {
|
| - RefPtrWillBeRawPtr<Element> element;
|
| + RawPtr<Element> element;
|
| // NOTE: Moving from item -> token -> item copies the Attribute vector twice!
|
| AtomicHTMLToken fakeToken(HTMLToken::StartTag, item->localName(), item->attributes());
|
| if (item->namespaceURI() == HTMLNames::xhtmlNamespaceURI)
|
| @@ -798,7 +798,7 @@ void HTMLConstructionSite::reconstructTheActiveFormattingElements()
|
| ASSERT(unopenEntryIndex < m_activeFormattingElements.size());
|
| for (; unopenEntryIndex < m_activeFormattingElements.size(); ++unopenEntryIndex) {
|
| HTMLFormattingElementList::Entry& unopenedEntry = m_activeFormattingElements.at(unopenEntryIndex);
|
| - RefPtrWillBeRawPtr<HTMLStackItem> reconstructed = createElementFromSavedToken(unopenedEntry.stackItem().get());
|
| + RawPtr<HTMLStackItem> reconstructed = createElementFromSavedToken(unopenedEntry.stackItem().get());
|
| attachLater(currentNode(), reconstructed->node());
|
| m_openElements.push(reconstructed);
|
| unopenedEntry.replaceElement(reconstructed.release());
|
| @@ -864,7 +864,7 @@ bool HTMLConstructionSite::shouldFosterParent() const
|
| && currentStackItem()->causesFosterParenting();
|
| }
|
|
|
| -void HTMLConstructionSite::fosterParent(PassRefPtrWillBeRawPtr<Node> node)
|
| +void HTMLConstructionSite::fosterParent(RawPtr<Node> node)
|
| {
|
| HTMLConstructionSiteTask task(HTMLConstructionSiteTask::Insert);
|
| findFosterSite(task);
|
|
|