Index: Source/core/css/MediaList.cpp |
diff --git a/Source/core/css/MediaList.cpp b/Source/core/css/MediaList.cpp |
index 11ae84b35d4a9b81b01b72d0a684dbc8633b60ca..aeb7e0e3c900eb28ddd691a365a1a03f438c7250 100644 |
--- a/Source/core/css/MediaList.cpp |
+++ b/Source/core/css/MediaList.cpp |
@@ -26,6 +26,8 @@ |
#include "core/css/MediaFeatureNames.h" |
#include "core/css/MediaQuery.h" |
#include "core/css/MediaQueryExp.h" |
+#include "core/css/parser/CSSToken.h" |
+#include "core/css/parser/MediaQueryParser.h" |
#include "core/dom/Document.h" |
#include "core/frame/DOMWindow.h" |
#include "wtf/text/StringBuilder.h" |
@@ -73,8 +75,8 @@ PassRefPtr<MediaQuerySet> MediaQuerySet::create(const String& mediaString) |
if (mediaString.isEmpty()) |
return MediaQuerySet::create(); |
- BisonCSSParser parser(strictCSSParserContext()); |
- return parser.parseMediaQueryList(mediaString); |
+ return MediaQueryParser::parse(mediaString); |
+ |
} |
bool MediaQuerySet::set(const String& mediaString) |
@@ -252,7 +254,7 @@ static void addResolutionWarningMessageToConsole(Document* document, const Strin |
document->addConsoleMessage(CSSMessageSource, DebugMessageLevel, message.toString()); |
} |
-static inline bool isResolutionMediaFeature(const AtomicString& mediaFeature) |
+static inline bool isResolutionMediaFeature(const String& mediaFeature) |
{ |
return mediaFeature == MediaFeatureNames::resolutionMediaFeature |
|| mediaFeature == MediaFeatureNames::maxResolutionMediaFeature |