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

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

Issue 879423003: Move Location to DOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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
« no previous file with comments | « no previous file | Source/core/editing/DOMSelection.cpp » ('j') | Source/core/frame/DOMWindow.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/StyleMedia.cpp
diff --git a/Source/core/css/StyleMedia.cpp b/Source/core/css/StyleMedia.cpp
index c8a6408ff7cb0fe4c4883ed43e57febd0899a84f..67b751b0035721b30b5391cfe2bf3ada382b1271 100644
--- a/Source/core/css/StyleMedia.cpp
+++ b/Source/core/css/StyleMedia.cpp
@@ -41,7 +41,7 @@ StyleMedia::StyleMedia(LocalFrame* frame)
AtomicString StyleMedia::type() const
{
- FrameView* view = m_frame ? m_frame->view() : 0;
+ FrameView* view = localFrame() ? localFrame()->view() : 0;
dcheng 2015/02/02 19:27:52 Nit: nullptr, since you're changing this anyway.
if (view)
return view->mediaType();
@@ -50,10 +50,10 @@ AtomicString StyleMedia::type() const
bool StyleMedia::matchMedium(const String& query) const
{
- if (!m_frame)
+ if (!localFrame())
return false;
- Document* document = m_frame->document();
+ Document* document = localFrame()->document();
ASSERT(document);
Element* documentElement = document->documentElement();
if (!documentElement)
@@ -63,7 +63,7 @@ bool StyleMedia::matchMedium(const String& query) const
if (!media->set(query))
return false;
- MediaQueryEvaluator screenEval(m_frame);
+ MediaQueryEvaluator screenEval(localFrame());
return screenEval.eval(media.get());
}
« no previous file with comments | « no previous file | Source/core/editing/DOMSelection.cpp » ('j') | Source/core/frame/DOMWindow.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698