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

Side by Side Diff: third_party/WebKit/Source/core/css/StyleMedia.cpp

Issue 2375873003: Make DOMWindowProperty::m_frame private (Closed)
Patch Set: Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/editing/DOMSelection.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 22 matching lines...) Expand all
33 33
34 namespace blink { 34 namespace blink {
35 35
36 StyleMedia::StyleMedia(LocalFrame* frame) 36 StyleMedia::StyleMedia(LocalFrame* frame)
37 : DOMWindowProperty(frame) 37 : DOMWindowProperty(frame)
38 { 38 {
39 } 39 }
40 40
41 AtomicString StyleMedia::type() const 41 AtomicString StyleMedia::type() const
42 { 42 {
43 FrameView* view = m_frame ? m_frame->view() : nullptr; 43 FrameView* view = frame() ? frame()->view() : nullptr;
44 if (view) 44 if (view)
45 return view->mediaType(); 45 return view->mediaType();
46 46
47 return nullAtom; 47 return nullAtom;
48 } 48 }
49 49
50 bool StyleMedia::matchMedium(const String& query) const 50 bool StyleMedia::matchMedium(const String& query) const
51 { 51 {
52 if (!m_frame) 52 if (!frame())
53 return false; 53 return false;
54 54
55 Document* document = m_frame->document(); 55 Document* document = frame()->document();
56 ASSERT(document); 56 ASSERT(document);
57 Element* documentElement = document->documentElement(); 57 Element* documentElement = document->documentElement();
58 if (!documentElement) 58 if (!documentElement)
59 return false; 59 return false;
60 60
61 MediaQuerySet* media = MediaQuerySet::create(); 61 MediaQuerySet* media = MediaQuerySet::create();
62 if (!media->set(query)) 62 if (!media->set(query))
63 return false; 63 return false;
64 64
65 MediaQueryEvaluator screenEval(m_frame); 65 MediaQueryEvaluator screenEval(frame());
66 return screenEval.eval(media); 66 return screenEval.eval(media);
67 } 67 }
68 68
69 DEFINE_TRACE(StyleMedia) 69 DEFINE_TRACE(StyleMedia)
70 { 70 {
71 DOMWindowProperty::trace(visitor); 71 DOMWindowProperty::trace(visitor);
72 } 72 }
73 73
74 } // namespace blink 74 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/editing/DOMSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698