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 "MediaTypeNames.h" | 8 #include "MediaTypeNames.h" |
9 #include "core/css/parser/CSSPropertyParser.h" | 9 #include "core/css/parser/CSSPropertyParser.h" |
10 #include "core/css/parser/MediaQueryTokenizer.h" | 10 #include "core/css/parser/MediaQueryTokenizer.h" |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 | 200 |
201 PassOwnPtrWillBeRawPtr<MediaQuery> MediaQueryData::takeMediaQuery() | 201 PassOwnPtrWillBeRawPtr<MediaQuery> MediaQueryData::takeMediaQuery() |
202 { | 202 { |
203 OwnPtrWillBeRawPtr<MediaQuery> mediaQuery = adoptPtrWillBeNoop(new MediaQuer
y(m_restrictor, m_mediaType, m_expressions.release())); | 203 OwnPtrWillBeRawPtr<MediaQuery> mediaQuery = adoptPtrWillBeNoop(new MediaQuer
y(m_restrictor, m_mediaType, m_expressions.release())); |
204 clear(); | 204 clear(); |
205 return mediaQuery.release(); | 205 return mediaQuery.release(); |
206 } | 206 } |
207 | 207 |
208 bool MediaQueryData::addExpression() | 208 bool MediaQueryData::addExpression() |
209 { | 209 { |
210 OwnPtrWillBeRawPtr<MediaQueryExp> expression = MediaQueryExp::create(m_media
Feature, &m_valueList); | 210 OwnPtrWillBeRawPtr<MediaQueryExp> expression = MediaQueryExp::createIfValid(
m_mediaFeature, &m_valueList); |
211 bool isValid = !!expression; | 211 bool isValid = !!expression; |
212 m_expressions->append(expression.release()); | 212 m_expressions->append(expression.release()); |
213 m_valueList.clear(); | 213 m_valueList.clear(); |
214 return isValid; | 214 return isValid; |
215 } | 215 } |
216 | 216 |
217 void MediaQueryData::addParserValue(MediaQueryTokenType type, MediaQueryToken& t
oken) | 217 void MediaQueryData::addParserValue(MediaQueryTokenType type, MediaQueryToken& t
oken) |
218 { | 218 { |
219 CSSParserValue value; | 219 CSSParserValue value; |
220 if (type == NumberToken || type == PercentageToken || type == DimensionToken
) { | 220 if (type == NumberToken || type == PercentageToken || type == DimensionToken
) { |
(...skipping 13 matching lines...) Expand all Loading... |
234 m_valueList.addValue(value); | 234 m_valueList.addValue(value); |
235 } | 235 } |
236 | 236 |
237 void MediaQueryData::setMediaType(const String& mediaType) | 237 void MediaQueryData::setMediaType(const String& mediaType) |
238 { | 238 { |
239 m_mediaType = mediaType; | 239 m_mediaType = mediaType; |
240 m_mediaTypeSet = true; | 240 m_mediaTypeSet = true; |
241 } | 241 } |
242 | 242 |
243 } // namespace WebCore | 243 } // namespace WebCore |
OLD | NEW |