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

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

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

index 5e52db89b309ce6ad035f678afa5735e6125f14b..320f0cb7beb9cb6f1373959f3491b9200536c8fe 100644

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

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

@@ -65,7 +65,7 @@ class HTMLToken {

WTF_MAKE_NONCOPYABLE(HTMLToken);

USING_FAST_MALLOC(HTMLToken);

public:

- enum Type {

+ enum TokenType {

Uninitialized,

DOCTYPE,

StartTag,

@@ -135,7 +135,7 @@ public:

}

bool isUninitialized() { return m_type == Uninitialized; }

- Type type() const { return m_type; }

+ TokenType type() const { return m_type; }

void makeEndOfFile()

{

@@ -459,7 +459,7 @@ public:

}

private:

- Type m_type;

+ TokenType m_type;

Attribute::Range m_range; // Always starts at zero.

int m_baseOffset;

DataVector m_data;