| 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, |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 } | 65 } |
| 66 | 66 |
| 67 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(MediaQuerySet) | 67 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(MediaQuerySet) |
| 68 | 68 |
| 69 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQuerySet::create(const String& mediaS
tring) | 69 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQuerySet::create(const String& mediaS
tring) |
| 70 { | 70 { |
| 71 if (mediaString.isEmpty()) | 71 if (mediaString.isEmpty()) |
| 72 return MediaQuerySet::create(); | 72 return MediaQuerySet::create(); |
| 73 | 73 |
| 74 if (RuntimeEnabledFeatures::mediaQueryParserEnabled()) | 74 if (RuntimeEnabledFeatures::mediaQueryParserEnabled()) |
| 75 return MediaQueryParser::parse(mediaString); | 75 return MediaQueryParser::parseMediaQuerySet(mediaString); |
| 76 | 76 |
| 77 BisonCSSParser parser(strictCSSParserContext()); | 77 BisonCSSParser parser(strictCSSParserContext()); |
| 78 return parser.parseMediaQueryList(mediaString); | 78 return parser.parseMediaQueryList(mediaString); |
| 79 } | 79 } |
| 80 | 80 |
| 81 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQuerySet::createOffMainThread(const S
tring& mediaString) | 81 PassRefPtrWillBeRawPtr<MediaQuerySet> MediaQuerySet::createOffMainThread(const S
tring& mediaString) |
| 82 { | 82 { |
| 83 if (mediaString.isEmpty()) | 83 if (mediaString.isEmpty()) |
| 84 return MediaQuerySet::create(); | 84 return MediaQuerySet::create(); |
| 85 | 85 |
| 86 return MediaQueryParser::parse(mediaString); | 86 return MediaQueryParser::parseMediaQuerySet(mediaString); |
| 87 } | 87 } |
| 88 | 88 |
| 89 bool MediaQuerySet::set(const String& mediaString) | 89 bool MediaQuerySet::set(const String& mediaString) |
| 90 { | 90 { |
| 91 RefPtrWillBeRawPtr<MediaQuerySet> result = create(mediaString); | 91 RefPtrWillBeRawPtr<MediaQuerySet> result = create(mediaString); |
| 92 m_queries.swap(result->m_queries); | 92 m_queries.swap(result->m_queries); |
| 93 return true; | 93 return true; |
| 94 } | 94 } |
| 95 | 95 |
| 96 bool MediaQuerySet::add(const String& queryString) | 96 bool MediaQuerySet::add(const String& queryString) |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 } | 316 } |
| 317 } | 317 } |
| 318 } | 318 } |
| 319 } | 319 } |
| 320 | 320 |
| 321 if (suspiciousValue && !dotsPerPixelUsed) | 321 if (suspiciousValue && !dotsPerPixelUsed) |
| 322 addResolutionWarningMessageToConsole(document, mediaQuerySet->mediaText(
), suspiciousValue); | 322 addResolutionWarningMessageToConsole(document, mediaQuerySet->mediaText(
), suspiciousValue); |
| 323 } | 323 } |
| 324 | 324 |
| 325 } | 325 } |
| OLD | NEW |