Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Side by Side Diff: third_party/WebKit/Source/core/css/parser/MediaQueryParser.cpp

Issue 2086283002: Convert CSSParserToken::valueEqualsIgnoringASCIICase to equalIgnoringASCIICase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/css/parser/MediaQueryParser.h" 5 #include "core/css/parser/MediaQueryParser.h"
6 6
7 #include "core/MediaTypeNames.h" 7 #include "core/MediaTypeNames.h"
8 #include "core/css/parser/CSSTokenizer.h" 8 #include "core/css/parser/CSSTokenizer.h"
9 #include "wtf/Vector.h" 9 #include "wtf/Vector.h"
10 10
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 } 57 }
58 58
59 // State machine member functions start here 59 // State machine member functions start here
60 void MediaQueryParser::readRestrictor(CSSParserTokenType type, const CSSParserTo ken& token) 60 void MediaQueryParser::readRestrictor(CSSParserTokenType type, const CSSParserTo ken& token)
61 { 61 {
62 readMediaType(type, token); 62 readMediaType(type, token);
63 } 63 }
64 64
65 void MediaQueryParser::readMediaNot(CSSParserTokenType type, const CSSParserToke n& token) 65 void MediaQueryParser::readMediaNot(CSSParserTokenType type, const CSSParserToke n& token)
66 { 66 {
67 if (type == IdentToken && token.valueEqualsIgnoringASCIICase("not")) 67 if (type == IdentToken && equalIgnoringASCIICase(token.value(), "not"))
68 setStateAndRestrict(ReadFeatureStart, MediaQuery::Not); 68 setStateAndRestrict(ReadFeatureStart, MediaQuery::Not);
69 else 69 else
70 readFeatureStart(type, token); 70 readFeatureStart(type, token);
71 } 71 }
72 72
73 static bool isRestrictorOrLogicalOperator(const CSSParserToken& token) 73 static bool isRestrictorOrLogicalOperator(const CSSParserToken& token)
74 { 74 {
75 // FIXME: it would be more efficient to use lower-case always for tokenValue . 75 // FIXME: it would be more efficient to use lower-case always for tokenValue .
76 return token.valueEqualsIgnoringASCIICase("not") 76 return equalIgnoringASCIICase(token.value(), "not")
77 || token.valueEqualsIgnoringASCIICase("and") 77 || equalIgnoringASCIICase(token.value(), "and")
78 || token.valueEqualsIgnoringASCIICase("or") 78 || equalIgnoringASCIICase(token.value(), "or")
79 || token.valueEqualsIgnoringASCIICase("only"); 79 || equalIgnoringASCIICase(token.value(), "only");
80 } 80 }
81 81
82 void MediaQueryParser::readMediaType(CSSParserTokenType type, const CSSParserTok en& token) 82 void MediaQueryParser::readMediaType(CSSParserTokenType type, const CSSParserTok en& token)
83 { 83 {
84 if (type == LeftParenthesisToken) { 84 if (type == LeftParenthesisToken) {
85 if (m_mediaQueryData.restrictor() != MediaQuery::None) 85 if (m_mediaQueryData.restrictor() != MediaQuery::None)
86 m_state = SkipUntilComma; 86 m_state = SkipUntilComma;
87 else 87 else
88 m_state = ReadFeature; 88 m_state = ReadFeature;
89 } else if (type == IdentToken) { 89 } else if (type == IdentToken) {
90 if (m_state == ReadRestrictor && token.valueEqualsIgnoringASCIICase("not ")) { 90 if (m_state == ReadRestrictor && equalIgnoringASCIICase(token.value(), " not")) {
91 setStateAndRestrict(ReadMediaType, MediaQuery::Not); 91 setStateAndRestrict(ReadMediaType, MediaQuery::Not);
92 } else if (m_state == ReadRestrictor && token.valueEqualsIgnoringASCIICa se("only")) { 92 } else if (m_state == ReadRestrictor && equalIgnoringASCIICase(token.val ue(), "only")) {
93 setStateAndRestrict(ReadMediaType, MediaQuery::Only); 93 setStateAndRestrict(ReadMediaType, MediaQuery::Only);
94 } else if (m_mediaQueryData.restrictor() != MediaQuery::None 94 } else if (m_mediaQueryData.restrictor() != MediaQuery::None
95 && isRestrictorOrLogicalOperator(token)) { 95 && isRestrictorOrLogicalOperator(token)) {
96 m_state = SkipUntilComma; 96 m_state = SkipUntilComma;
97 } else { 97 } else {
98 m_mediaQueryData.setMediaType(token.value().toString()); 98 m_mediaQueryData.setMediaType(token.value().toString());
99 m_state = ReadAnd; 99 m_state = ReadAnd;
100 } 100 }
101 } else if (type == EOFToken && (!m_querySet->queryVector().size() || m_state != ReadRestrictor)) { 101 } else if (type == EOFToken && (!m_querySet->queryVector().size() || m_state != ReadRestrictor)) {
102 m_state = Done; 102 m_state = Done;
103 } else { 103 } else {
104 m_state = SkipUntilComma; 104 m_state = SkipUntilComma;
105 if (type == CommaToken) 105 if (type == CommaToken)
106 skipUntilComma(type, token); 106 skipUntilComma(type, token);
107 } 107 }
108 } 108 }
109 109
110 void MediaQueryParser::readAnd(CSSParserTokenType type, const CSSParserToken& to ken) 110 void MediaQueryParser::readAnd(CSSParserTokenType type, const CSSParserToken& to ken)
111 { 111 {
112 if (type == IdentToken && token.valueEqualsIgnoringASCIICase("and")) { 112 if (type == IdentToken && equalIgnoringASCIICase(token.value(), "and")) {
113 m_state = ReadFeatureStart; 113 m_state = ReadFeatureStart;
114 } else if (type == CommaToken && m_parserType != MediaConditionParser) { 114 } else if (type == CommaToken && m_parserType != MediaConditionParser) {
115 m_querySet->addMediaQuery(m_mediaQueryData.takeMediaQuery()); 115 m_querySet->addMediaQuery(m_mediaQueryData.takeMediaQuery());
116 m_state = ReadRestrictor; 116 m_state = ReadRestrictor;
117 } else if (type == EOFToken) { 117 } else if (type == EOFToken) {
118 m_state = Done; 118 m_state = Done;
119 } else { 119 } else {
120 m_state = SkipUntilComma; 120 m_state = SkipUntilComma;
121 } 121 }
122 } 122 }
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 return false; 274 return false;
275 } 275 }
276 276
277 void MediaQueryData::setMediaType(const String& mediaType) 277 void MediaQueryData::setMediaType(const String& mediaType)
278 { 278 {
279 m_mediaType = mediaType; 279 m_mediaType = mediaType;
280 m_mediaTypeSet = true; 280 m_mediaTypeSet = true;
281 } 281 }
282 282
283 } // namespace blink 283 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698