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

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

Issue 1858753003: Remove RawPtr from core/css (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 14 matching lines...) Expand all
25 #include "core/css/MediaQueryListEvent.h" 25 #include "core/css/MediaQueryListEvent.h"
26 #include "core/css/MediaQueryListListener.h" 26 #include "core/css/MediaQueryListListener.h"
27 #include "core/css/resolver/StyleResolver.h" 27 #include "core/css/resolver/StyleResolver.h"
28 #include "core/dom/Document.h" 28 #include "core/dom/Document.h"
29 #include "core/frame/FrameView.h" 29 #include "core/frame/FrameView.h"
30 #include "core/frame/LocalFrame.h" 30 #include "core/frame/LocalFrame.h"
31 #include "wtf/Vector.h" 31 #include "wtf/Vector.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 RawPtr<MediaQueryMatcher> MediaQueryMatcher::create(Document& document) 35 MediaQueryMatcher* MediaQueryMatcher::create(Document& document)
36 { 36 {
37 return new MediaQueryMatcher(document); 37 return new MediaQueryMatcher(document);
38 } 38 }
39 39
40 MediaQueryMatcher::MediaQueryMatcher(Document& document) 40 MediaQueryMatcher::MediaQueryMatcher(Document& document)
41 : m_document(&document) 41 : m_document(&document)
42 { 42 {
43 ASSERT(m_document); 43 ASSERT(m_document);
44 } 44 }
45 45
46 MediaQueryMatcher::~MediaQueryMatcher() 46 MediaQueryMatcher::~MediaQueryMatcher()
47 { 47 {
48 } 48 }
49 49
50 void MediaQueryMatcher::documentDetached() 50 void MediaQueryMatcher::documentDetached()
51 { 51 {
52 m_document = nullptr; 52 m_document = nullptr;
53 m_evaluator = nullptr; 53 m_evaluator = nullptr;
54 } 54 }
55 55
56 RawPtr<MediaQueryEvaluator> MediaQueryMatcher::createEvaluator() const 56 MediaQueryEvaluator* MediaQueryMatcher::createEvaluator() const
57 { 57 {
58 if (!m_document || !m_document->frame()) 58 if (!m_document || !m_document->frame())
59 return nullptr; 59 return nullptr;
60 60
61 return new MediaQueryEvaluator(m_document->frame()); 61 return new MediaQueryEvaluator(m_document->frame());
62 } 62 }
63 63
64 bool MediaQueryMatcher::evaluate(const MediaQuerySet* media) 64 bool MediaQueryMatcher::evaluate(const MediaQuerySet* media)
65 { 65 {
66 ASSERT(!m_document || m_document->frame() || !m_evaluator); 66 ASSERT(!m_document || m_document->frame() || !m_evaluator);
67 67
68 if (!media) 68 if (!media)
69 return false; 69 return false;
70 70
71 // Cache the evaluator to avoid allocating one per evaluation. 71 // Cache the evaluator to avoid allocating one per evaluation.
72 if (!m_evaluator) 72 if (!m_evaluator)
73 m_evaluator = createEvaluator(); 73 m_evaluator = createEvaluator();
74 74
75 if (m_evaluator) 75 if (m_evaluator)
76 return m_evaluator->eval(media); 76 return m_evaluator->eval(media);
77 77
78 return false; 78 return false;
79 } 79 }
80 80
81 RawPtr<MediaQueryList> MediaQueryMatcher::matchMedia(const String& query) 81 MediaQueryList* MediaQueryMatcher::matchMedia(const String& query)
82 { 82 {
83 if (!m_document) 83 if (!m_document)
84 return nullptr; 84 return nullptr;
85 85
86 RawPtr<MediaQuerySet> media = MediaQuerySet::create(query); 86 MediaQuerySet* media = MediaQuerySet::create(query);
87 return MediaQueryList::create(m_document, this, media); 87 return MediaQueryList::create(m_document, this, media);
88 } 88 }
89 89
90 void MediaQueryMatcher::addMediaQueryList(MediaQueryList* query) 90 void MediaQueryMatcher::addMediaQueryList(MediaQueryList* query)
91 { 91 {
92 if (!m_document) 92 if (!m_document)
93 return; 93 return;
94 m_mediaLists.add(query); 94 m_mediaLists.add(query);
95 } 95 }
96 96
97 void MediaQueryMatcher::removeMediaQueryList(MediaQueryList* query) 97 void MediaQueryMatcher::removeMediaQueryList(MediaQueryList* query)
98 { 98 {
99 if (!m_document) 99 if (!m_document)
100 return; 100 return;
101 m_mediaLists.remove(query); 101 m_mediaLists.remove(query);
102 } 102 }
103 103
104 void MediaQueryMatcher::addViewportListener(RawPtr<MediaQueryListListener> liste ner) 104 void MediaQueryMatcher::addViewportListener(MediaQueryListListener* listener)
105 { 105 {
106 if (!m_document) 106 if (!m_document)
107 return; 107 return;
108 m_viewportListeners.add(listener); 108 m_viewportListeners.add(listener);
109 } 109 }
110 110
111 void MediaQueryMatcher::removeViewportListener(RawPtr<MediaQueryListListener> li stener) 111 void MediaQueryMatcher::removeViewportListener(MediaQueryListListener* listener)
112 { 112 {
113 if (!m_document) 113 if (!m_document)
114 return; 114 return;
115 m_viewportListeners.remove(listener); 115 m_viewportListeners.remove(listener);
116 } 116 }
117 117
118 void MediaQueryMatcher::mediaFeaturesChanged() 118 void MediaQueryMatcher::mediaFeaturesChanged()
119 { 119 {
120 if (!m_document) 120 if (!m_document)
121 return; 121 return;
122 122
123 HeapVector<Member<MediaQueryListListener>> listenersToNotify; 123 HeapVector<Member<MediaQueryListListener>> listenersToNotify;
124 for (const auto& list : m_mediaLists) { 124 for (const auto& list : m_mediaLists) {
125 if (list->mediaFeaturesChanged(&listenersToNotify)) { 125 if (list->mediaFeaturesChanged(&listenersToNotify)) {
126 RawPtr<Event> event(MediaQueryListEvent::create(list)); 126 Event* event = MediaQueryListEvent::create(list);
127 event->setTarget(list); 127 event->setTarget(list);
128 m_document->enqueueUniqueAnimationFrameEvent(event); 128 m_document->enqueueUniqueAnimationFrameEvent(event);
129 } 129 }
130 } 130 }
131 m_document->enqueueMediaQueryChangeListeners(listenersToNotify); 131 m_document->enqueueMediaQueryChangeListeners(listenersToNotify);
132 } 132 }
133 133
134 void MediaQueryMatcher::viewportChanged() 134 void MediaQueryMatcher::viewportChanged()
135 { 135 {
136 if (!m_document) 136 if (!m_document)
137 return; 137 return;
138 138
139 HeapVector<Member<MediaQueryListListener>> listenersToNotify; 139 HeapVector<Member<MediaQueryListListener>> listenersToNotify;
140 for (const auto& listener : m_viewportListeners) 140 for (const auto& listener : m_viewportListeners)
141 listenersToNotify.append(listener); 141 listenersToNotify.append(listener);
142 142
143 m_document->enqueueMediaQueryChangeListeners(listenersToNotify); 143 m_document->enqueueMediaQueryChangeListeners(listenersToNotify);
144 } 144 }
145 145
146 DEFINE_TRACE(MediaQueryMatcher) 146 DEFINE_TRACE(MediaQueryMatcher)
147 { 147 {
148 visitor->trace(m_document); 148 visitor->trace(m_document);
149 visitor->trace(m_evaluator); 149 visitor->trace(m_evaluator);
150 visitor->trace(m_mediaLists); 150 visitor->trace(m_mediaLists);
151 visitor->trace(m_viewportListeners); 151 visitor->trace(m_viewportListeners);
152 } 152 }
153 153
154 } // namespace blink 154 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/MediaQueryMatcher.h ('k') | third_party/WebKit/Source/core/css/MediaQueryMatcherTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698