Index: Source/core/css/MediaQuery.cpp |
diff --git a/Source/core/css/MediaQuery.cpp b/Source/core/css/MediaQuery.cpp |
index fc1dc9e6735d7293360173b7a0d82a4072a440ae..d108c8dca01ae3b020e17d0061301440cbda71a9 100644 |
--- a/Source/core/css/MediaQuery.cpp |
+++ b/Source/core/css/MediaQuery.cpp |
@@ -29,7 +29,9 @@ |
#include "config.h" |
#include "core/css/MediaQuery.h" |
+#include "MediaTypeNames.h" |
#include "core/css/MediaQueryExp.h" |
+#include "core/html/parser/HTMLParserIdioms.h" |
#include "wtf/NonCopyingSort.h" |
#include "wtf/text/StringBuilder.h" |
@@ -55,7 +57,7 @@ String MediaQuery::serialize() const |
return result.toString(); |
} |
- if (m_mediaType != "all" || m_restrictor != None) { |
+ if (m_mediaType != MediaTypeNames::all || m_restrictor != None) { |
result.append(m_mediaType); |
result.append(" and "); |
} |
@@ -73,9 +75,9 @@ static bool expressionCompare(const OwnPtrWillBeMember<MediaQueryExp>& a, const |
return codePointCompare(a->serialize(), b->serialize()) < 0; |
} |
-MediaQuery::MediaQuery(Restrictor r, const AtomicString& mediaType, PassOwnPtrWillBeRawPtr<ExpressionHeapVector> expressions) |
+MediaQuery::MediaQuery(Restrictor r, const String& mediaType, PassOwnPtrWillBeRawPtr<ExpressionHeapVector> expressions) |
: m_restrictor(r) |
- , m_mediaType(mediaType.lower()) |
+ , m_mediaType(attemptStaticStringCreation(mediaType.lower())) |
, m_expressions(expressions) |
{ |
if (!m_expressions) { |
@@ -99,7 +101,7 @@ MediaQuery::MediaQuery(Restrictor r, const AtomicString& mediaType, PassOwnPtrWi |
MediaQuery::MediaQuery(const MediaQuery& o) |
: m_restrictor(o.m_restrictor) |
- , m_mediaType(o.m_mediaType) |
+ , m_mediaType(o.m_mediaType.impl()) |
abarth-chromium
2014/03/06 08:03:57
Why is this needed? Normally you can assign one s
|
, m_expressions(adoptPtrWillBeNoop(new ExpressionHeapVector(o.m_expressions->size()))) |
, m_serializationCache(o.m_serializationCache) |
{ |