Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(697)

Unified Diff: Source/core/css/StyleMedia.cpp

Issue 242883002: Remove MediaValues' dependency on RenderStyle (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Modified minimal recalc tests to represent reduced recalc. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/css/StyleMedia.cpp
diff --git a/Source/core/css/StyleMedia.cpp b/Source/core/css/StyleMedia.cpp
index 8b34d7ea15842baa710bb42a051bebd2974eac1d..c18d26c592c1b614c9be819b47102fefa22d6425 100644
--- a/Source/core/css/StyleMedia.cpp
+++ b/Source/core/css/StyleMedia.cpp
@@ -28,7 +28,6 @@
#include "core/css/MediaList.h"
#include "core/css/MediaQueryEvaluator.h"
-#include "core/css/resolver/StyleResolver.h"
#include "core/dom/Document.h"
#include "core/frame/FrameView.h"
#include "core/frame/LocalFrame.h"
@@ -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);
-
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());
}

Powered by Google App Engine
This is Rietveld 408576698