summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/WebKit/Source/core/css/StyleMedia.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/css/StyleMedia.cpp')
-rw-r--r--chromium/third_party/WebKit/Source/core/css/StyleMedia.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/chromium/third_party/WebKit/Source/core/css/StyleMedia.cpp b/chromium/third_party/WebKit/Source/core/css/StyleMedia.cpp
index 791ef27328f..c18d26c592c 100644
--- a/chromium/third_party/WebKit/Source/core/css/StyleMedia.cpp
+++ b/chromium/third_party/WebKit/Source/core/css/StyleMedia.cpp
@@ -28,14 +28,13 @@
#include "core/css/MediaList.h"
#include "core/css/MediaQueryEvaluator.h"
-#include "core/css/resolver/StyleResolver.h"
#include "core/dom/Document.h"
-#include "core/frame/Frame.h"
#include "core/frame/FrameView.h"
+#include "core/frame/LocalFrame.h"
namespace WebCore {
-StyleMedia::StyleMedia(Frame* frame)
+StyleMedia::StyleMedia(LocalFrame* frame)
: DOMWindowProperty(frame)
{
}
@@ -60,14 +59,11 @@ bool StyleMedia::matchMedium(const String& query) const
if (!documentElement)
return false;
- StyleResolver& styleResolver = document->ensureStyleResolver();
- RefPtr<RenderStyle> rootStyle = styleResolver.styleForElement(documentElement, 0 /*defaultParent*/, DisallowStyleSharing, MatchOnlyUserAgentRules);
-
- RefPtr<MediaQuerySet> media = MediaQuerySet::create();
+ RefPtrWillBeRawPtr<MediaQuerySet> media = MediaQuerySet::create();
if (!media->set(query))
return false;
- MediaQueryEvaluator screenEval(type(), m_frame, rootStyle.get());
+ MediaQueryEvaluator screenEval(type(), m_frame);
return screenEval.eval(media.get());
}