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

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 1740483004: Rename enums/functions that collide in chromium style in core/html/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-5

Patch Set: get-names-6: . 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

« no previous file with comments | « third_party/WebKit/Source/core/html/parser/CompactHTMLToken.h ('k') | third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.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 a353983f55b72b6361f9dc5687e86e18bef53b29..5b95df721e9008e54c3f654ebdac088e898145c3 100644

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

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

@@ -430,7 +430,7 @@ void HTMLDocumentParser::validateSpeculations(PassOwnPtr<ParsedChunk> chunk)

// speculation buffer in other states, but we'd likely need to do something more

// sophisticated with the HTMLToken.

if (chunk->tokenizerState == HTMLTokenizer::DataState

- && tokenizer->state() == HTMLTokenizer::DataState

+ && tokenizer->getState() == HTMLTokenizer::DataState

&& m_input.current().isEmpty()

&& chunk->treeBuilderState == HTMLTreeBuilderSimulator::stateFor(m_treeBuilder.get())) {

ASSERT(token->isUninitialized());

@@ -680,7 +680,7 @@ void HTMLDocumentParser::pumpTokenizer()

RELEASE_ASSERT(!isStopped());

if (isWaitingForScripts()) {

- ASSERT(m_tokenizer->state() == HTMLTokenizer::DataState);

+ ASSERT(m_tokenizer->getState() == HTMLTokenizer::DataState);

ASSERT(m_preloader);

// TODO(kouhei): m_preloader should be always available for synchronous parsing case,