third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp - Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3

Patch Set: get-names-4: Created 4 years, 10 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

« third_party/WebKit/Source/core/dom/Node.h ('K') | « third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.h ('k') | third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 bd84b305306ae63e3d71c760acb147795e1541b8..a353983f55b72b6361f9dc5687e86e18bef53b29 100644

--- a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp

+++ b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp

@@ -143,7 +143,7 @@ HTMLDocumentParser::HTMLDocumentParser(HTMLDocument& document, bool reportErrors

, m_token(syncPolicy == ForceSynchronousParsing ? adoptPtr(new HTMLToken) : nullptr)

, m_tokenizer(syncPolicy == ForceSynchronousParsing ? HTMLTokenizer::create(m_options) : nullptr)

, m_scriptRunner(HTMLScriptRunner::create(&document, this))

- , m_treeBuilder(HTMLTreeBuilder::create(this, &document, parserContentPolicy(), reportErrors, m_options))

+ , m_treeBuilder(HTMLTreeBuilder::create(this, &document, getParserContentPolicy(), reportErrors, m_options))

, m_loadingTaskRunner(adoptPtr(document.loadingTaskRunner()->clone()))

, m_parserScheduler(HTMLParserScheduler::create(this, m_loadingTaskRunner.get()))

, m_xssAuditorDelegate(&document)

@@ -168,7 +168,7 @@ HTMLDocumentParser::HTMLDocumentParser(DocumentFragment* fragment, Element* cont

, m_options(&fragment->document())

, m_token(adoptPtr(new HTMLToken))

, m_tokenizer(HTMLTokenizer::create(m_options))

- , m_treeBuilder(HTMLTreeBuilder::create(this, fragment, contextElement, this->parserContentPolicy(), m_options))

+ , m_treeBuilder(HTMLTreeBuilder::create(this, fragment, contextElement, this->getParserContentPolicy(), m_options))

, m_loadingTaskRunner(adoptPtr(fragment->document().loadingTaskRunner()->clone()))

, m_xssAuditorDelegate(&fragment->document())

, m_weakFactory(this)

@@ -321,7 +321,7 @@ void HTMLDocumentParser::resumeParsingAfterYield()

void HTMLDocumentParser::runScriptsForPausedTreeBuilder()

{

- ASSERT(scriptingContentIsAllowed(parserContentPolicy()));

+ ASSERT(scriptingContentIsAllowed(getParserContentPolicy()));

TextPosition scriptStartPosition = TextPosition::belowRangePosition();

RefPtrWillBeRawPtr<Element> scriptElement = m_treeBuilder->takeScriptToProcess(scriptStartPosition);