third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp - 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/CSSParserTokenRange.cpp

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

Index: third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp

diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp

index 7381a7c2a7721cb1600aa5691493e05fdc27fa82..bda8767e9d96032fad6e00389e064491191d54b1 100644

--- a/third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp

+++ b/third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp

@@ -28,14 +28,14 @@ CSSParserTokenRange CSSParserTokenRange::makeSubRange(const CSSParserToken* firs

CSSParserTokenRange CSSParserTokenRange::consumeBlock()

{

- ASSERT(peek().blockType() == CSSParserToken::BlockStart);

+ ASSERT(peek().getBlockType() == CSSParserToken::BlockStart);

const CSSParserToken* start = &peek() + 1;

unsigned nestingLevel = 0;

do {

const CSSParserToken& token = consume();

- if (token.blockType() == CSSParserToken::BlockStart)

+ if (token.getBlockType() == CSSParserToken::BlockStart)

nestingLevel++;

- else if (token.blockType() == CSSParserToken::BlockEnd)

+ else if (token.getBlockType() == CSSParserToken::BlockEnd)

nestingLevel--;

} while (nestingLevel && m_first < m_last);

@@ -51,9 +51,9 @@ void CSSParserTokenRange::consumeComponentValue()