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

Unified Diff: third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp

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/HTMLDocumentParser.cpp
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp
index 2bc5e321de9ef9f85f9ebd6528d863b6d9ab12b7..9202908137be992d80bc19f0156f1a9ad7b25825 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp
+++ b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp
@@ -85,12 +85,12 @@ static HTMLTokenizer::State tokenizerStateForContextElement(Element* contextElem
return HTMLTokenizer::DataState;
}
-class ParserDataReceiver final : public RefCountedWillBeGarbageCollectedFinalized<ParserDataReceiver>, public DocumentLifecycleObserver {
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ParserDataReceiver);
+class ParserDataReceiver final : public GarbageCollectedFinalized<ParserDataReceiver>, public DocumentLifecycleObserver {
+ USING_GARBAGE_COLLECTED_MIXIN(ParserDataReceiver);
public:
- static PassRefPtrWillBeRawPtr<ParserDataReceiver> create(WeakPtr<BackgroundHTMLParser> backgroundParser, Document* document)
+ static RawPtr<ParserDataReceiver> create(WeakPtr<BackgroundHTMLParser> backgroundParser, Document* document)
{
- return adoptRefWillBeNoop(new ParserDataReceiver(backgroundParser, document));
+ return new ParserDataReceiver(backgroundParser, document);
}
DEFINE_INLINE_VIRTUAL_TRACE()
@@ -231,7 +231,7 @@ void HTMLDocumentParser::prepareToStopParsing()
// pumpTokenizer can cause this parser to be detached from the Document,
// but we need to ensure it isn't deleted yet.
- RefPtrWillBeRawPtr<HTMLDocumentParser> protect(this);
+ RawPtr<HTMLDocumentParser> protect(this);
// NOTE: This pump should only ever emit buffered character tokens.
if (m_tokenizer) {
@@ -282,7 +282,7 @@ void HTMLDocumentParser::resumeParsingAfterYield()
// pumpPendingSpeculations can cause this parser to be detached from the Document,
// but we need to ensure it isn't deleted yet.
- RefPtrWillBeRawPtr<HTMLDocumentParser> protect(this);
+ RawPtr<HTMLDocumentParser> protect(this);
pumpPendingSpeculations();
}
@@ -291,7 +291,7 @@ void HTMLDocumentParser::runScriptsForPausedTreeBuilder()
ASSERT(scriptingContentIsAllowed(getParserContentPolicy()));
TextPosition scriptStartPosition = TextPosition::belowRangePosition();
- RefPtrWillBeRawPtr<Element> scriptElement = m_treeBuilder->takeScriptToProcess(scriptStartPosition);
+ RawPtr<Element> scriptElement = m_treeBuilder->takeScriptToProcess(scriptStartPosition);
// We will not have a scriptRunner when parsing a DocumentFragment.
if (m_scriptRunner)
m_scriptRunner->execute(scriptElement.release(), scriptStartPosition);
@@ -724,7 +724,7 @@ void HTMLDocumentParser::insert(const SegmentedString& source)
// pumpTokenizer can cause this parser to be detached from the Document,
// but we need to ensure it isn't deleted yet.
- RefPtrWillBeRawPtr<HTMLDocumentParser> protect(this);
+ RawPtr<HTMLDocumentParser> protect(this);
if (!m_tokenizer) {
ASSERT(!inPumpSession());
@@ -818,7 +818,7 @@ void HTMLDocumentParser::append(const String& inputSource)
// pumpTokenizer can cause this parser to be detached from the Document,
// but we need to ensure it isn't deleted yet.
- RefPtrWillBeRawPtr<HTMLDocumentParser> protect(this);
+ RawPtr<HTMLDocumentParser> protect(this);
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("blink.debug"), "HTMLDocumentParser::append", "size", inputSource.length());
const SegmentedString source(inputSource);
@@ -905,7 +905,7 @@ void HTMLDocumentParser::finish()
// However, FrameLoader::stop calls DocumentParser::finish unconditionally.
// flush may ending up executing arbitrary script, and possibly detach the parser.
- RefPtrWillBeRawPtr<HTMLDocumentParser> protect(this);
+ RawPtr<HTMLDocumentParser> protect(this);
flush();
if (isDetached())
return;
@@ -996,7 +996,7 @@ void HTMLDocumentParser::resumeParsingAfterScriptExecution()
ASSERT(!m_lastChunkBeforeScript);
// processParsedChunkFromBackgroundParser can cause this parser to be detached from the Document,
// but we need to ensure it isn't deleted yet.
- RefPtrWillBeRawPtr<HTMLDocumentParser> protect(this);
+ RawPtr<HTMLDocumentParser> protect(this);
pumpPendingSpeculations();
return;
}
@@ -1017,7 +1017,7 @@ void HTMLDocumentParser::notifyScriptLoaded(Resource* cachedResource)
{
// pumpTokenizer can cause this parser to be detached from the Document,
// but we need to ensure it isn't deleted yet.
- RefPtrWillBeRawPtr<HTMLDocumentParser> protect(this);
+ RawPtr<HTMLDocumentParser> protect(this);
ASSERT(m_scriptRunner);
ASSERT(!isExecutingScript());
@@ -1049,7 +1049,7 @@ void HTMLDocumentParser::executeScriptsWaitingForResources()
// pumpTokenizer can cause this parser to be detached from the Document,
// but we need to ensure it isn't deleted yet.
- RefPtrWillBeRawPtr<HTMLDocumentParser> protect(this);
+ RawPtr<HTMLDocumentParser> protect(this);
m_scriptRunner->executeScriptsWaitingForResources();
if (!isWaitingForScripts())
resumeParsingAfterScriptExecution();
@@ -1057,7 +1057,7 @@ void HTMLDocumentParser::executeScriptsWaitingForResources()
void HTMLDocumentParser::parseDocumentFragment(const String& source, DocumentFragment* fragment, Element* contextElement, ParserContentPolicy parserContentPolicy)
{
- RefPtrWillBeRawPtr<HTMLDocumentParser> parser = HTMLDocumentParser::create(fragment, contextElement, parserContentPolicy);
+ RawPtr<HTMLDocumentParser> parser = HTMLDocumentParser::create(fragment, contextElement, parserContentPolicy);
parser->append(source);
parser->finish();
parser->detach(); // Allows ~DocumentParser to assert it was detached before destruction.

Powered by Google App Engine
This is Rietveld 408576698