OLD | NEW |
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 "config.h" | 5 #include "config.h" |
6 #include "core/css/parser/MediaQueryParser.h" | 6 #include "core/css/parser/MediaQueryParser.h" |
7 | 7 |
8 #include "core/MediaTypeNames.h" | 8 #include "core/MediaTypeNames.h" |
9 #include "core/css/parser/CSSPropertyParser.h" | 9 #include "core/css/parser/CSSPropertyParser.h" |
10 #include "core/css/parser/CSSTokenizer.h" | 10 #include "core/css/parser/CSSTokenizer.h" |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 readFeatureEnd(type, token); | 149 readFeatureEnd(type, token); |
150 else | 150 else |
151 m_state = SkipUntilBlockEnd; | 151 m_state = SkipUntilBlockEnd; |
152 } | 152 } |
153 | 153 |
154 void MediaQueryParser::readFeatureValue(CSSParserTokenType type, const CSSParser
Token& token) | 154 void MediaQueryParser::readFeatureValue(CSSParserTokenType type, const CSSParser
Token& token) |
155 { | 155 { |
156 if (type == DimensionToken && token.unitType() == CSSPrimitiveValue::CSS_UNK
NOWN) { | 156 if (type == DimensionToken && token.unitType() == CSSPrimitiveValue::CSS_UNK
NOWN) { |
157 m_state = SkipUntilComma; | 157 m_state = SkipUntilComma; |
158 } else { | 158 } else { |
159 if (m_mediaQueryData.tryAddParserValue(type, token)) | 159 if (m_mediaQueryData.tryAddParserToken(type, token)) |
160 m_state = ReadFeatureEnd; | 160 m_state = ReadFeatureEnd; |
161 else | 161 else |
162 m_state = SkipUntilBlockEnd; | 162 m_state = SkipUntilBlockEnd; |
163 } | 163 } |
164 } | 164 } |
165 | 165 |
166 void MediaQueryParser::readFeatureEnd(CSSParserTokenType type, const CSSParserTo
ken& token) | 166 void MediaQueryParser::readFeatureEnd(CSSParserTokenType type, const CSSParserTo
ken& token) |
167 { | 167 { |
168 if (type == RightParenthesisToken || type == EOFToken) { | 168 if (type == RightParenthesisToken || type == EOFToken) { |
169 if (m_mediaQueryData.addExpression()) | 169 if (m_mediaQueryData.addExpression()) |
170 m_state = ReadAnd; | 170 m_state = ReadAnd; |
171 else | 171 else |
172 m_state = SkipUntilComma; | 172 m_state = SkipUntilComma; |
173 } else if (type == DelimiterToken && token.delimiter() == '/') { | 173 } else if (type == DelimiterToken && token.delimiter() == '/') { |
174 m_mediaQueryData.tryAddParserValue(type, token); | 174 m_mediaQueryData.tryAddParserToken(type, token); |
175 m_state = ReadFeatureValue; | 175 m_state = ReadFeatureValue; |
176 } else { | 176 } else { |
177 m_state = SkipUntilBlockEnd; | 177 m_state = SkipUntilBlockEnd; |
178 } | 178 } |
179 } | 179 } |
180 | 180 |
181 void MediaQueryParser::skipUntilComma(CSSParserTokenType type, const CSSParserTo
ken& token) | 181 void MediaQueryParser::skipUntilComma(CSSParserTokenType type, const CSSParserTo
ken& token) |
182 { | 182 { |
183 if ((type == CommaToken && !m_blockWatcher.blockLevel()) || type == EOFToken
) { | 183 if ((type == CommaToken && !m_blockWatcher.blockLevel()) || type == EOFToken
) { |
184 m_state = ReadRestrictor; | 184 m_state = ReadRestrictor; |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 , m_mediaTypeSet(false) | 239 , m_mediaTypeSet(false) |
240 { | 240 { |
241 } | 241 } |
242 | 242 |
243 void MediaQueryData::clear() | 243 void MediaQueryData::clear() |
244 { | 244 { |
245 m_restrictor = MediaQuery::None; | 245 m_restrictor = MediaQuery::None; |
246 m_mediaType = MediaTypeNames::all; | 246 m_mediaType = MediaTypeNames::all; |
247 m_mediaTypeSet = false; | 247 m_mediaTypeSet = false; |
248 m_mediaFeature = String(); | 248 m_mediaFeature = String(); |
249 m_valueList.destroyAndClear(); | 249 m_valueList.clear(); |
250 m_expressions = adoptPtrWillBeNoop(new ExpressionHeapVector); | 250 m_expressions = adoptPtrWillBeNoop(new ExpressionHeapVector); |
251 } | 251 } |
252 | 252 |
253 PassOwnPtrWillBeRawPtr<MediaQuery> MediaQueryData::takeMediaQuery() | 253 PassOwnPtrWillBeRawPtr<MediaQuery> MediaQueryData::takeMediaQuery() |
254 { | 254 { |
255 OwnPtrWillBeRawPtr<MediaQuery> mediaQuery = adoptPtrWillBeNoop(new MediaQuer
y(m_restrictor, m_mediaType, m_expressions.release())); | 255 OwnPtrWillBeRawPtr<MediaQuery> mediaQuery = adoptPtrWillBeNoop(new MediaQuer
y(m_restrictor, m_mediaType, m_expressions.release())); |
256 clear(); | 256 clear(); |
257 return mediaQuery.release(); | 257 return mediaQuery.release(); |
258 } | 258 } |
259 | 259 |
260 bool MediaQueryData::addExpression() | 260 bool MediaQueryData::addExpression() |
261 { | 261 { |
262 OwnPtrWillBeRawPtr<MediaQueryExp> expression = MediaQueryExp::createIfValid(
m_mediaFeature, &m_valueList); | 262 OwnPtrWillBeRawPtr<MediaQueryExp> expression = MediaQueryExp::createIfValid(
m_mediaFeature, m_valueList); |
263 bool isValid = !!expression; | 263 bool isValid = !!expression; |
264 m_expressions->append(expression.release()); | 264 m_expressions->append(expression.release()); |
265 m_valueList.destroyAndClear(); | 265 m_valueList.clear(); |
266 return isValid; | 266 return isValid; |
267 } | 267 } |
268 | 268 |
269 bool MediaQueryData::tryAddParserValue(CSSParserTokenType type, const CSSParserT
oken& token) | 269 bool MediaQueryData::tryAddParserToken(CSSParserTokenType type, const CSSParserT
oken& token) |
270 { | 270 { |
271 CSSParserValue value; | 271 if (type == NumberToken || type == PercentageToken || type == DimensionToken |
272 if (type == NumberToken || type == PercentageToken || type == DimensionToken
) { | 272 || type == DelimiterToken || type == IdentToken) { |
273 value.setFromNumber(token.numericValue(), token.unitType()); | 273 m_valueList.append(token); |
274 value.isInt = (token.numericValueType() == IntegerValueType); | 274 return true; |
275 } else if (type == DelimiterToken) { | |
276 value.unit = CSSParserValue::Operator; | |
277 value.iValue = token.delimiter(); | |
278 value.id = CSSValueInvalid; | |
279 value.isInt = false; | |
280 } else if (type == IdentToken) { | |
281 value.unit = CSSPrimitiveValue::CSS_IDENT; | |
282 value.string = token.value(); | |
283 value.id = cssValueKeywordID(token.value()); | |
284 value.isInt = false; | |
285 } else { | |
286 return false; | |
287 } | 275 } |
288 m_valueList.addValue(value); | 276 |
289 return true; | 277 return false; |
290 } | 278 } |
291 | 279 |
292 void MediaQueryData::setMediaType(const String& mediaType) | 280 void MediaQueryData::setMediaType(const String& mediaType) |
293 { | 281 { |
294 m_mediaType = mediaType; | 282 m_mediaType = mediaType; |
295 m_mediaTypeSet = true; | 283 m_mediaTypeSet = true; |
296 } | 284 } |
297 | 285 |
298 } // namespace blink | 286 } // namespace blink |
OLD | NEW |