Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / StyleMedia.cpp

diff --git a/src/third_party/WebKit/Source/core/css/StyleMedia.cpp b/src/third_party/WebKit/Source/core/css/StyleMedia.cpp
index c18d26c..c8a6408 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/StyleMedia.cpp
+++ b/src/third_party/WebKit/Source/core/css/StyleMedia.cpp
@@ -32,7 +32,7 @@
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 
-namespace WebCore {
+namespace blink {
 
 StyleMedia::StyleMedia(LocalFrame* frame)
     : DOMWindowProperty(frame)
@@ -63,8 +63,13 @@ bool StyleMedia::matchMedium(const String& query) const
     if (!media->set(query))
         return false;
 
-    MediaQueryEvaluator screenEval(type(), m_frame);
+    MediaQueryEvaluator screenEval(m_frame);
     return screenEval.eval(media.get());
 }
 
-} // namespace WebCore
+void StyleMedia::trace(Visitor* visitor)
+{
+    DOMWindowProperty::trace(visitor);
+}
+
+} // namespace blink