third_party/WebKit/Source/core/html/parser/AtomicHTMLToken.h - 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/AtomicHTMLToken.h

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

Index: third_party/WebKit/Source/core/html/parser/AtomicHTMLToken.h

diff --git a/third_party/WebKit/Source/core/html/parser/AtomicHTMLToken.h b/third_party/WebKit/Source/core/html/parser/AtomicHTMLToken.h

index b5284b5e30aced595d9c3b9fbb8b1e3777d94105..a01298ee9f98cc3c1f9d7c9637719c12051a1c25 100644

--- a/third_party/WebKit/Source/core/html/parser/AtomicHTMLToken.h

+++ b/third_party/WebKit/Source/core/html/parser/AtomicHTMLToken.h

@@ -47,7 +47,7 @@ public:

return m_doctypeData->m_forceQuirks;

}

- HTMLToken::Type type() const { return m_type; }

+ HTMLToken::TokenType type() const { return m_type; }

const AtomicString& name() const

{

@@ -182,13 +182,13 @@ public:

}

- explicit AtomicHTMLToken(HTMLToken::Type type)

+ explicit AtomicHTMLToken(HTMLToken::TokenType type)

: m_type(type)

, m_selfClosing(false)

{

}

- AtomicHTMLToken(HTMLToken::Type type, const AtomicString& name, const Vector<Attribute>& attributes = Vector<Attribute>())

+ AtomicHTMLToken(HTMLToken::TokenType type, const AtomicString& name, const Vector<Attribute>& attributes = Vector<Attribute>())

: m_type(type)

, m_name(name)

, m_selfClosing(false)

@@ -198,7 +198,7 @@ public:

}

private:

- HTMLToken::Type m_type;

+ HTMLToken::TokenType m_type;

void initializeAttributes(const HTMLToken::AttributeList& attributes);

QualifiedName nameForAttribute(const HTMLToken::Attribute&) const;