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

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

Issue 2024373002: Replace CSSParserString with StringView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Match arguments to equalStringView. 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/CSSPropertyParser.h" 8 #include "core/css/parser/CSSPropertyParser.h"
9 #include "core/css/parser/CSSTokenizer.h" 9 #include "core/css/parser/CSSTokenizer.h"
10 #include "wtf/Vector.h" 10 #include "wtf/Vector.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 m_state = ReadFeature; 89 m_state = ReadFeature;
90 } else if (type == IdentToken) { 90 } else if (type == IdentToken) {
91 if (m_state == ReadRestrictor && token.valueEqualsIgnoringASCIICase("not ")) { 91 if (m_state == ReadRestrictor && token.valueEqualsIgnoringASCIICase("not ")) {
92 setStateAndRestrict(ReadMediaType, MediaQuery::Not); 92 setStateAndRestrict(ReadMediaType, MediaQuery::Not);
93 } else if (m_state == ReadRestrictor && token.valueEqualsIgnoringASCIICa se("only")) { 93 } else if (m_state == ReadRestrictor && token.valueEqualsIgnoringASCIICa se("only")) {
94 setStateAndRestrict(ReadMediaType, MediaQuery::Only); 94 setStateAndRestrict(ReadMediaType, MediaQuery::Only);
95 } else if (m_mediaQueryData.restrictor() != MediaQuery::None 95 } else if (m_mediaQueryData.restrictor() != MediaQuery::None
96 && isRestrictorOrLogicalOperator(token)) { 96 && isRestrictorOrLogicalOperator(token)) {
97 m_state = SkipUntilComma; 97 m_state = SkipUntilComma;
98 } else { 98 } else {
99 m_mediaQueryData.setMediaType(token.value()); 99 m_mediaQueryData.setMediaType(token.value().toString());
100 m_state = ReadAnd; 100 m_state = ReadAnd;
101 } 101 }
102 } else if (type == EOFToken && (!m_querySet->queryVector().size() || m_state != ReadRestrictor)) { 102 } else if (type == EOFToken && (!m_querySet->queryVector().size() || m_state != ReadRestrictor)) {
103 m_state = Done; 103 m_state = Done;
104 } else { 104 } else {
105 m_state = SkipUntilComma; 105 m_state = SkipUntilComma;
106 if (type == CommaToken) 106 if (type == CommaToken)
107 skipUntilComma(type, token); 107 skipUntilComma(type, token);
108 } 108 }
109 } 109 }
(...skipping 16 matching lines...) Expand all
126 { 126 {
127 if (type == LeftParenthesisToken) 127 if (type == LeftParenthesisToken)
128 m_state = ReadFeature; 128 m_state = ReadFeature;
129 else 129 else
130 m_state = SkipUntilComma; 130 m_state = SkipUntilComma;
131 } 131 }
132 132
133 void MediaQueryParser::readFeature(CSSParserTokenType type, const CSSParserToken & token) 133 void MediaQueryParser::readFeature(CSSParserTokenType type, const CSSParserToken & token)
134 { 134 {
135 if (type == IdentToken) { 135 if (type == IdentToken) {
136 m_mediaQueryData.setMediaFeature(token.value()); 136 m_mediaQueryData.setMediaFeature(token.value().toString());
137 m_state = ReadFeatureColon; 137 m_state = ReadFeatureColon;
138 } else { 138 } else {
139 m_state = SkipUntilComma; 139 m_state = SkipUntilComma;
140 } 140 }
141 } 141 }
142 142
143 void MediaQueryParser::readFeatureColon(CSSParserTokenType type, const CSSParser Token& token) 143 void MediaQueryParser::readFeatureColon(CSSParserTokenType type, const CSSParser Token& token)
144 { 144 {
145 if (type == ColonToken) 145 if (type == ColonToken)
146 m_state = ReadFeatureValue; 146 m_state = ReadFeatureValue;
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 return false; 275 return false;
276 } 276 }
277 277
278 void MediaQueryData::setMediaType(const String& mediaType) 278 void MediaQueryData::setMediaType(const String& mediaType)
279 { 279 {
280 m_mediaType = mediaType; 280 m_mediaType = mediaType;
281 m_mediaTypeSet = true; 281 m_mediaTypeSet = true;
282 } 282 }
283 283
284 } // namespace blink 284 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698