| 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" |
| 11 #include "wtf/Vector.h" | 11 #include "wtf/Vector.h" |
| 12 | 12 |
| 13 namespace blink { | 13 namespace blink { |
| 14 | 14 |
| 15 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQueryParser::parseMediaQuerySet(const
String& queryString) | 15 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQueryParser::parseMediaQuerySet(const
String& queryString) |
| 16 { | 16 { |
| 17 // FIXME: Replace the CSSTokenizer with a generic CSSTokenizer, once there i
s one, | 17 return parseMediaQuerySet(CSSTokenizer::Scope(queryString).tokenRange()); |
| 18 // or better yet, replace the MediaQueryParser with a generic thread-safe CS
S parser. | |
| 19 Vector<CSSParserToken> tokens; | |
| 20 CSSTokenizer::tokenize(queryString, tokens); | |
| 21 return parseMediaQuerySet(tokens); | |
| 22 } | 18 } |
| 23 | 19 |
| 24 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQueryParser::parseMediaQuerySet(CSSPa
rserTokenRange range) | 20 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQueryParser::parseMediaQuerySet(CSSPa
rserTokenRange range) |
| 25 { | 21 { |
| 26 return MediaQueryParser(MediaQuerySetParser).parseImpl(range); | 22 return MediaQueryParser(MediaQuerySetParser).parseImpl(range); |
| 27 } | 23 } |
| 28 | 24 |
| 29 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQueryParser::parseMediaCondition(CSSP
arserTokenRange range) | 25 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQueryParser::parseMediaCondition(CSSP
arserTokenRange range) |
| 30 { | 26 { |
| 31 return MediaQueryParser(MediaConditionParser).parseImpl(range); | 27 return MediaQueryParser(MediaConditionParser).parseImpl(range); |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 return true; | 291 return true; |
| 296 } | 292 } |
| 297 | 293 |
| 298 void MediaQueryData::setMediaType(const String& mediaType) | 294 void MediaQueryData::setMediaType(const String& mediaType) |
| 299 { | 295 { |
| 300 m_mediaType = mediaType; | 296 m_mediaType = mediaType; |
| 301 m_mediaTypeSet = true; | 297 m_mediaTypeSet = true; |
| 302 } | 298 } |
| 303 | 299 |
| 304 } // namespace blink | 300 } // namespace blink |
| OLD | NEW |