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

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

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

index cfb23db101b7164092d71ca38ef46fb90ac6f4f4..5dadb44e81e0512f25b5ed2030be4058193b2704 100644

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

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

@@ -51,7 +51,7 @@ MediaQueryParser::MediaQueryParser(ParserType parserType)

MediaQueryParser::~MediaQueryParser() { }

-void MediaQueryParser::setStateAndRestrict(State state, MediaQuery::Restrictor restrictor)

+void MediaQueryParser::setStateAndRestrict(State state, MediaQuery::RestrictorType restrictor)

{

m_mediaQueryData.setRestrictor(restrictor);

m_state = state;

@@ -188,7 +188,7 @@ void MediaQueryParser::skipUntilComma(CSSParserTokenType type, const CSSParserTo

void MediaQueryParser::skipUntilBlockEnd(CSSParserTokenType type, const CSSParserToken& token)

{

- if (token.blockType() == CSSParserToken::BlockEnd && !m_blockWatcher.blockLevel())

+ if (token.getBlockType() == CSSParserToken::BlockEnd && !m_blockWatcher.blockLevel())

m_state = SkipUntilComma;

}

@@ -196,7 +196,7 @@ void MediaQueryParser::done(CSSParserTokenType type, const CSSParserToken& token

void MediaQueryParser::handleBlocks(const CSSParserToken& token)

{

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

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

&& (token.type() != LeftParenthesisToken || m_blockWatcher.blockLevel()))

m_state = SkipUntilBlockEnd;

}