third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.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/HTMLTreeBuilder.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/HTMLDocumentParser.cpp ('k') | third_party/WebKit/Source/core/inspector/DOMPatchSupport.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3d1a4f5f267c891d67d04dd8747f2d978ad8519c..39b2b1f8f0723f2d052a0c4180afd1c672ef0e84 100644

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

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

@@ -755,7 +755,7 @@ void HTMLTreeBuilder::processStartTagForInBody(AtomicHTMLToken* token)

if (token->name() == appletTag

|| token->name() == embedTag

|| token->name() == objectTag) {

- if (!pluginContentIsAllowed(m_tree.parserContentPolicy()))

+ if (!pluginContentIsAllowed(m_tree.getParserContentPolicy()))

return;

}

if (token->name() == appletTag

@@ -2113,7 +2113,7 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken* token)

if (token->name() == scriptTag) {

// Pause ourselves so that parsing stops until the script can be processed by the caller.

ASSERT(m_tree.currentStackItem()->hasTagName(scriptTag));

- if (scriptingContentIsAllowed(m_tree.parserContentPolicy()))

+ if (scriptingContentIsAllowed(m_tree.getParserContentPolicy()))

m_scriptToProcess = m_tree.currentElement();

m_tree.openElements()->pop();

setInsertionMode(m_originalInsertionMode);

@@ -2768,7 +2768,7 @@ void HTMLTreeBuilder::processTokenInForeignContent(AtomicHTMLToken* token)

adjustSVGTagNameCase(token);

if (token->name() == SVGNames::scriptTag && m_tree.currentStackItem()->hasTagName(SVGNames::scriptTag)) {

- if (scriptingContentIsAllowed(m_tree.parserContentPolicy()))

+ if (scriptingContentIsAllowed(m_tree.getParserContentPolicy()))

m_scriptToProcess = m_tree.currentElement();

m_tree.openElements()->pop();

return;