third_party/WebKit/Source/core/css/parser/MediaQueryParser.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/MediaQueryParser.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/MediaQueryBlockWatcher.cpp ('k') | third_party/WebKit/Source/core/css/parser/MediaQueryParser.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.h

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

index 6744e7db64b337bc6f7510f630d798abe71c07d4..bb05cba01ef52fcb37f2cbb3af82c391c1648610 100644

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

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

@@ -22,7 +22,7 @@ class MediaQueryData {

STACK_ALLOCATED();

WTF_MAKE_NONCOPYABLE(MediaQueryData);

private:

- MediaQuery::Restrictor m_restrictor;

+ MediaQuery::RestrictorType m_restrictor;

String m_mediaType;

ExpressionHeapVector m_expressions;

String m_mediaFeature;

@@ -41,9 +41,9 @@ public:

{

return (m_restrictor != MediaQuery::None || m_mediaTypeSet || m_expressions.size() > 0);

}

- inline MediaQuery::Restrictor restrictor() { return m_restrictor; }

+ inline MediaQuery::RestrictorType restrictor() { return m_restrictor; }

- inline void setRestrictor(MediaQuery::Restrictor restrictor) { m_restrictor = restrictor; }

+ inline void setRestrictor(MediaQuery::RestrictorType restrictor) { m_restrictor = restrictor; }

inline void setMediaFeature(const String& str) { m_mediaFeature = str; }

};

@@ -83,7 +83,7 @@ private:

using State = void (MediaQueryParser::*)(CSSParserTokenType, const CSSParserToken&);

- void setStateAndRestrict(State, MediaQuery::Restrictor);

+ void setStateAndRestrict(State, MediaQuery::RestrictorType);

void handleBlocks(const CSSParserToken&);

State m_state;