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

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

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

index 297ff31f2af84a710d7d42d4793e052f7905689f..f0255092bbf02a08bd8b66a4ec30268f4092c2b7 100644

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

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

@@ -29,7 +29,7 @@ bool isValidVariableReference(CSSParserTokenRange);

bool classifyBlock(CSSParserTokenRange range, bool& hasReferences, bool isTopLevelBlock = true)

{

while (!range.atEnd()) {

- if (range.peek().blockType() == CSSParserToken::BlockStart) {

+ if (range.peek().getBlockType() == CSSParserToken::BlockStart) {

const CSSParserToken& token = range.peek();

CSSParserTokenRange block = range.consumeBlock();

if (token.functionId() == CSSValueVar) {

@@ -43,7 +43,7 @@ bool classifyBlock(CSSParserTokenRange range, bool& hasReferences, bool isTopLev

continue;

}

- ASSERT(range.peek().blockType() != CSSParserToken::BlockEnd);

+ ASSERT(range.peek().getBlockType() != CSSParserToken::BlockEnd);

const CSSParserToken& token = range.consume();

switch (token.type()) {