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 "MediaFeatureNames.h" | 23 #include "MediaFeatureNames.h" |
24 #include "bindings/v8/ExceptionState.h" | 24 #include "bindings/v8/ExceptionState.h" |
25 #include "core/css/parser/BisonCSSParser.h" | 25 #include "core/css/parser/BisonCSSParser.h" |
26 #include "core/css/CSSStyleSheet.h" | 26 #include "core/css/CSSStyleSheet.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/MediaQueryParser.h" |
29 #include "core/dom/Document.h" | 30 #include "core/dom/Document.h" |
30 #include "core/frame/DOMWindow.h" | 31 #include "core/frame/DOMWindow.h" |
31 #include "wtf/text/StringBuilder.h" | 32 #include "wtf/text/StringBuilder.h" |
32 | 33 |
33 namespace WebCore { | 34 namespace WebCore { |
34 | 35 |
35 /* MediaList is used to store 3 types of media related entities which mean the s
ame: | 36 /* MediaList is used to store 3 types of media related entities which mean the s
ame: |
36 * | 37 * |
37 * Media Queries, Media Types and Media Descriptors. | 38 * Media Queries, Media Types and Media Descriptors. |
38 * | 39 * |
(...skipping 24 matching lines...) Expand all Loading... |
63 m_queries[i] = o.m_queries[i]->copy(); | 64 m_queries[i] = o.m_queries[i]->copy(); |
64 } | 65 } |
65 | 66 |
66 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(MediaQuerySet) | 67 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(MediaQuerySet) |
67 | 68 |
68 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQuerySet::create(const String& mediaS
tring) | 69 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQuerySet::create(const String& mediaS
tring) |
69 { | 70 { |
70 if (mediaString.isEmpty()) | 71 if (mediaString.isEmpty()) |
71 return MediaQuerySet::create(); | 72 return MediaQuerySet::create(); |
72 | 73 |
73 BisonCSSParser parser(strictCSSParserContext()); | 74 return MediaQueryParser::parse(mediaString); |
74 return parser.parseMediaQueryList(mediaString); | 75 |
75 } | 76 } |
76 | 77 |
77 bool MediaQuerySet::set(const String& mediaString) | 78 bool MediaQuerySet::set(const String& mediaString) |
78 { | 79 { |
79 RefPtrWillBeRawPtr<MediaQuerySet> result = create(mediaString); | 80 RefPtrWillBeRawPtr<MediaQuerySet> result = create(mediaString); |
80 m_queries.swap(result->m_queries); | 81 m_queries.swap(result->m_queries); |
81 return true; | 82 return true; |
82 } | 83 } |
83 | 84 |
84 bool MediaQuerySet::add(const String& queryString) | 85 bool MediaQuerySet::add(const String& queryString) |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 if ((primitiveValue->isDotsPerInch() || primitiveValue->isDo
tsPerCentimeter()) && !overriden.contains(expression->mediaFeature())) | 300 if ((primitiveValue->isDotsPerInch() || primitiveValue->isDo
tsPerCentimeter()) && !overriden.contains(expression->mediaFeature())) |
300 addResolutionWarningMessageToConsole(document, mediaQuer
ySet->mediaText(), primitiveValue); | 301 addResolutionWarningMessageToConsole(document, mediaQuer
ySet->mediaText(), primitiveValue); |
301 } | 302 } |
302 overriden.add(expression->mediaFeature()); | 303 overriden.add(expression->mediaFeature()); |
303 } | 304 } |
304 } | 305 } |
305 } | 306 } |
306 } | 307 } |
307 | 308 |
308 } | 309 } |
OLD | NEW |