third_party/WebKit/Source/core/css/parser/CSSParserToken.h - Issue 1729013002: blink: Rename enums and functions to not collide with chromium style.

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/css/parser/CSSParserToken.h

Issue 1729013002: blink: Rename enums and functions to not collide with chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get-names-3: . 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/css/parser/CSSParserObserver.h ('k') | third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/parser/CSSParserToken.h

diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserToken.h b/third_party/WebKit/Source/core/css/parser/CSSParserToken.h

index 811db8560a21f1240262eb2c19e2972caf328920..9ee58f45386c234e5727537a24c5b512c4bb3d3b 100644

--- a/third_party/WebKit/Source/core/css/parser/CSSParserToken.h

+++ b/third_party/WebKit/Source/core/css/parser/CSSParserToken.h

@@ -135,8 +135,8 @@ public:

NumericSign numericSign() const;

NumericValueType numericValueType() const;

double numericValue() const;

- HashTokenType hashTokenType() const { ASSERT(m_type == HashToken); return m_hashTokenType; }

- BlockType blockType() const { return static_cast<BlockType>(m_blockType); }

+ HashTokenType getHashTokenType() const { ASSERT(m_type == HashToken); return m_hashTokenType; }

+ BlockType getBlockType() const { return static_cast<BlockType>(m_blockType); }

CSSPrimitiveValue::UnitType unitType() const { return static_cast<CSSPrimitiveValue::UnitType>(m_unit); }

UChar32 unicodeRangeStart() const { ASSERT(m_type == UnicodeRangeToken); return m_unicodeRange.start; }

UChar32 unicodeRangeEnd() const { ASSERT(m_type == UnicodeRangeToken); return m_unicodeRange.end; }