OLD | NEW |
1 /* | 1 /* |
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) | 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) |
3 * Copyright (C) 2004, 2006, 2010, 2012 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2006, 2010, 2012 Apple Inc. All rights reserved. |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 * Library General Public License for more details. | 13 * Library General Public License for more details. |
14 * | 14 * |
15 * You should have received a copy of the GNU Library General Public License | 15 * You should have received a copy of the GNU Library General Public License |
16 * along with this library; see the file COPYING.LIB. If not, write to | 16 * along with this library; see the file COPYING.LIB. If not, write to |
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
18 * Boston, MA 02110-1301, USA. | 18 * Boston, MA 02110-1301, USA. |
19 */ | 19 */ |
20 #include "config.h" | 20 #include "config.h" |
21 #include "core/css/MediaList.h" | 21 #include "core/css/MediaList.h" |
22 | 22 |
23 #include "bindings/v8/ExceptionState.h" | 23 #include "bindings/v8/ExceptionState.h" |
24 #include "core/css/parser/BisonCSSParser.h" | 24 #include "core/css/parser/BisonCSSParser.h" |
25 #include "core/css/CSSStyleSheet.h" | 25 #include "core/css/CSSStyleSheet.h" |
26 #include "core/css/MediaFeatureNames.h" | 26 #include "core/css/MediaFeatureNames.h" |
27 #include "core/css/MediaQuery.h" | 27 #include "core/css/MediaQuery.h" |
28 #include "core/css/MediaQueryExp.h" | 28 #include "core/css/MediaQueryExp.h" |
| 29 #include "core/css/parser/CSSToken.h" |
| 30 #include "core/css/parser/MediaQueryParser.h" |
29 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
30 #include "core/frame/DOMWindow.h" | 32 #include "core/frame/DOMWindow.h" |
31 #include "wtf/text/StringBuilder.h" | 33 #include "wtf/text/StringBuilder.h" |
32 | 34 |
33 namespace WebCore { | 35 namespace WebCore { |
34 | 36 |
35 /* MediaList is used to store 3 types of media related entities which mean the s
ame: | 37 /* MediaList is used to store 3 types of media related entities which mean the s
ame: |
36 * | 38 * |
37 * Media Queries, Media Types and Media Descriptors. | 39 * Media Queries, Media Types and Media Descriptors. |
38 * | 40 * |
(...skipping 27 matching lines...) Expand all Loading... |
66 | 68 |
67 MediaQuerySet::~MediaQuerySet() | 69 MediaQuerySet::~MediaQuerySet() |
68 { | 70 { |
69 } | 71 } |
70 | 72 |
71 PassRefPtr<MediaQuerySet> MediaQuerySet::create(const String& mediaString) | 73 PassRefPtr<MediaQuerySet> MediaQuerySet::create(const String& mediaString) |
72 { | 74 { |
73 if (mediaString.isEmpty()) | 75 if (mediaString.isEmpty()) |
74 return MediaQuerySet::create(); | 76 return MediaQuerySet::create(); |
75 | 77 |
76 BisonCSSParser parser(strictCSSParserContext()); | 78 return MediaQueryParser::parse(mediaString); |
77 return parser.parseMediaQueryList(mediaString); | 79 |
78 } | 80 } |
79 | 81 |
80 bool MediaQuerySet::set(const String& mediaString) | 82 bool MediaQuerySet::set(const String& mediaString) |
81 { | 83 { |
82 RefPtr<MediaQuerySet> result = create(mediaString); | 84 RefPtr<MediaQuerySet> result = create(mediaString); |
83 m_queries.swap(result->m_queries); | 85 m_queries.swap(result->m_queries); |
84 return true; | 86 return true; |
85 } | 87 } |
86 | 88 |
87 bool MediaQuerySet::add(const String& queryString) | 89 bool MediaQuerySet::add(const String& queryString) |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 else if (value->isDotsPerCentimeter()) | 247 else if (value->isDotsPerCentimeter()) |
246 message.append(String(mediaQueryMessage).replace("%replacementUnits%", m
ediaValueDPCM).replace("%lengthUnit%", lengthUnitCentimeter)); | 248 message.append(String(mediaQueryMessage).replace("%replacementUnits%", m
ediaValueDPCM).replace("%lengthUnit%", lengthUnitCentimeter)); |
247 else | 249 else |
248 ASSERT_NOT_REACHED(); | 250 ASSERT_NOT_REACHED(); |
249 | 251 |
250 message.append(serializedExpression); | 252 message.append(serializedExpression); |
251 | 253 |
252 document->addConsoleMessage(CSSMessageSource, DebugMessageLevel, message.toS
tring()); | 254 document->addConsoleMessage(CSSMessageSource, DebugMessageLevel, message.toS
tring()); |
253 } | 255 } |
254 | 256 |
255 static inline bool isResolutionMediaFeature(const AtomicString& mediaFeature) | 257 static inline bool isResolutionMediaFeature(const String& mediaFeature) |
256 { | 258 { |
257 return mediaFeature == MediaFeatureNames::resolutionMediaFeature | 259 return mediaFeature == MediaFeatureNames::resolutionMediaFeature |
258 || mediaFeature == MediaFeatureNames::maxResolutionMediaFeature | 260 || mediaFeature == MediaFeatureNames::maxResolutionMediaFeature |
259 || mediaFeature == MediaFeatureNames::minResolutionMediaFeature; | 261 || mediaFeature == MediaFeatureNames::minResolutionMediaFeature; |
260 } | 262 } |
261 | 263 |
262 void reportMediaQueryWarningIfNeeded(Document* document, const MediaQuerySet* me
diaQuerySet) | 264 void reportMediaQueryWarningIfNeeded(Document* document, const MediaQuerySet* me
diaQuerySet) |
263 { | 265 { |
264 if (!mediaQuerySet || !document) | 266 if (!mediaQuerySet || !document) |
265 return; | 267 return; |
(...skipping 18 matching lines...) Expand all Loading... |
284 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(cssV
alue); | 286 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(cssV
alue); |
285 if (primitiveValue->isDotsPerInch() || primitiveValue->isDot
sPerCentimeter()) | 287 if (primitiveValue->isDotsPerInch() || primitiveValue->isDot
sPerCentimeter()) |
286 addResolutionWarningMessageToConsole(document, mediaQuer
ySet->mediaText(), primitiveValue); | 288 addResolutionWarningMessageToConsole(document, mediaQuer
ySet->mediaText(), primitiveValue); |
287 } | 289 } |
288 } | 290 } |
289 } | 291 } |
290 } | 292 } |
291 } | 293 } |
292 | 294 |
293 } | 295 } |
OLD | NEW |