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

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

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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 6d7a665b2a80160dc85fb544a72bdf89378848af..f1c24d7ded5b7b8f8ebf4d4db6ac601bfd24dc1e 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp
+++ b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp
@@ -125,8 +125,9 @@ HTMLDocumentParser::HTMLDocumentParser(Document& document,
: ScriptableDocumentParser(document, contentPolicy),
m_options(&document),
m_reentryPermit(HTMLParserReentryPermit::create()),
- m_token(syncPolicy == ForceSynchronousParsing ? wrapUnique(new HTMLToken)
- : nullptr),
+ m_token(syncPolicy == ForceSynchronousParsing
+ ? WTF::wrapUnique(new HTMLToken)
+ : nullptr),
m_tokenizer(syncPolicy == ForceSynchronousParsing
? HTMLTokenizer::create(m_options)
: nullptr),
@@ -458,7 +459,7 @@ void HTMLDocumentParser::discardSpeculationsAndResumeFrom(
m_queuedPreloads.clear();
std::unique_ptr<BackgroundHTMLParser::Checkpoint> checkpoint =
- wrapUnique(new BackgroundHTMLParser::Checkpoint);
+ WTF::wrapUnique(new BackgroundHTMLParser::Checkpoint);
checkpoint->parser = m_weakFactory.createWeakPtr();
checkpoint->token = std::move(token);
checkpoint->tokenizer = std::move(tokenizer);
@@ -473,7 +474,8 @@ void HTMLDocumentParser::discardSpeculationsAndResumeFrom(
ASSERT(checkpoint->unparsedInput.isSafeToSendToAnotherThread());
postTaskToLookaheadParser(Asynchronous, &BackgroundHTMLParser::resumeFrom,
- m_backgroundParser, passed(std::move(checkpoint)));
+ m_backgroundParser,
+ WTF::passed(std::move(checkpoint)));
}
size_t HTMLDocumentParser::processTokenizedChunkFromBackgroundParser(
@@ -782,7 +784,7 @@ void HTMLDocumentParser::insert(const SegmentedString& source) {
if (!m_tokenizer) {
ASSERT(!inPumpSession());
ASSERT(m_haveBackgroundParser || wasCreatedByScript());
- m_token = wrapUnique(new HTMLToken);
+ m_token = WTF::wrapUnique(new HTMLToken);
m_tokenizer = HTMLTokenizer::create(m_options);
}
@@ -821,10 +823,10 @@ void HTMLDocumentParser::startBackgroundParser() {
document()->ensureStyleResolver();
std::unique_ptr<BackgroundHTMLParser::Configuration> config =
- wrapUnique(new BackgroundHTMLParser::Configuration);
+ WTF::wrapUnique(new BackgroundHTMLParser::Configuration);
config->options = m_options;
config->parser = m_weakFactory.createWeakPtr();
- config->xssAuditor = wrapUnique(new XSSAuditor);
+ config->xssAuditor = WTF::wrapUnique(new XSSAuditor);
config->xssAuditor->init(document(), &m_xssAuditorDelegate);
config->decoder = takeDecoder();
@@ -850,7 +852,8 @@ void HTMLDocumentParser::startBackgroundParser() {
// correct thread. We should get rid of it.
postTaskToLookaheadParser(
Synchronous, &BackgroundHTMLParser::init, m_backgroundParser,
- document()->url(), passed(CachedDocumentParameters::create(document())),
+ document()->url(),
+ WTF::passed(CachedDocumentParameters::create(document())),
MediaValuesCached::MediaValuesCachedData(*document()));
}
@@ -994,7 +997,7 @@ void HTMLDocumentParser::finish() {
ASSERT(!m_token);
// We're finishing before receiving any data. Rather than booting up the
// background parser just to spin it down, we finish parsing synchronously.
- m_token = wrapUnique(new HTMLToken);
+ m_token = WTF::wrapUnique(new HTMLToken);
m_tokenizer = HTMLTokenizer::create(m_options);
}
@@ -1146,7 +1149,8 @@ void HTMLDocumentParser::appendBytes(const char* data, size_t length) {
if (!m_haveBackgroundParser)
startBackgroundParser();
- std::unique_ptr<Vector<char>> buffer = makeUnique<Vector<char>>(length);
+ std::unique_ptr<Vector<char>> buffer =
+ WTF::makeUnique<Vector<char>>(length);
memcpy(buffer->data(), data, length);
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("blink.debug"),
"HTMLDocumentParser::appendBytes", "size", (unsigned)length);
@@ -1158,7 +1162,7 @@ void HTMLDocumentParser::appendBytes(const char* data, size_t length) {
: Asynchronous;
postTaskToLookaheadParser(
policy, &BackgroundHTMLParser::appendRawBytesFromMainThread,
- m_backgroundParser, passed(std::move(buffer)), bytesReceivedTime);
+ m_backgroundParser, WTF::passed(std::move(buffer)), bytesReceivedTime);
return;
}
@@ -1175,7 +1179,7 @@ void HTMLDocumentParser::flush() {
// Fallback to synchronous parsing in that case.
if (!m_haveBackgroundParser) {
m_shouldUseThreading = false;
- m_token = wrapUnique(new HTMLToken);
+ m_token = WTF::wrapUnique(new HTMLToken);
m_tokenizer = HTMLTokenizer::create(m_options);
DecodedDataDocumentParser::flush();
return;
@@ -1193,9 +1197,10 @@ void HTMLDocumentParser::setDecoder(
ASSERT(decoder);
DecodedDataDocumentParser::setDecoder(std::move(decoder));
- if (m_haveBackgroundParser)
+ if (m_haveBackgroundParser) {
postTaskToLookaheadParser(Asynchronous, &BackgroundHTMLParser::setDecoder,
- m_backgroundParser, passed(takeDecoder()));
+ m_backgroundParser, WTF::passed(takeDecoder()));
+ }
}
void HTMLDocumentParser::documentElementAvailable() {

Powered by Google App Engine
This is Rietveld 408576698