third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.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/BackgroundHTMLParser.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/AtomicHTMLToken.h ('k') | third_party/WebKit/Source/core/html/parser/CompactHTMLToken.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.cpp

diff --git a/third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.cpp b/third_party/WebKit/Source/core/html/parser/BackgroundHTMLParser.cpp

index ceca5de33508124efd16201b5b4fdb79daf2634f..9cb896d295bf5f2f0b3e51d1f5cfaeb17501de81 100644

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

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

@@ -284,7 +284,7 @@ void BackgroundHTMLParser::sendTokensToMainThread()

OwnPtr<HTMLDocumentParser::ParsedChunk> chunk = adoptPtr(new HTMLDocumentParser::ParsedChunk);

chunk->preloads.swap(m_pendingPreloads);

chunk->xssInfos.swap(m_pendingXSSInfos);

- chunk->tokenizerState = m_tokenizer->state();

+ chunk->tokenizerState = m_tokenizer->getState();

chunk->treeBuilderState = m_treeBuilderSimulator.state();

chunk->inputCheckpoint = m_input.createCheckpoint(m_pendingTokens->size());

chunk->preloadScannerCheckpoint = m_preloadScanner->createCheckpoint();