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

Side by Side Diff: Source/core/frame/EventHandlerRegistry.cpp

Issue 642293004: Use C++11 range-based loop in core/frame (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use meaningful names Created 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/frame/EventHandlerRegistry.h" 6 #include "core/frame/EventHandlerRegistry.h"
7 7
8 #include "core/events/ThreadLocalEventNames.h" 8 #include "core/events/ThreadLocalEventNames.h"
9 #include "core/frame/LocalDOMWindow.h" 9 #include "core/frame/LocalDOMWindow.h"
10 #include "core/frame/LocalFrame.h" 10 #include "core/frame/LocalFrame.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 { 200 {
201 visitor->registerWeakMembers<EventHandlerRegistry, &EventHandlerRegistry::cl earWeakMembers>(this); 201 visitor->registerWeakMembers<EventHandlerRegistry, &EventHandlerRegistry::cl earWeakMembers>(this);
202 } 202 }
203 203
204 void EventHandlerRegistry::clearWeakMembers(Visitor* visitor) 204 void EventHandlerRegistry::clearWeakMembers(Visitor* visitor)
205 { 205 {
206 Vector<EventTarget*> deadTargets; 206 Vector<EventTarget*> deadTargets;
207 for (size_t i = 0; i < EventHandlerClassCount; ++i) { 207 for (size_t i = 0; i < EventHandlerClassCount; ++i) {
208 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i); 208 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i);
209 const EventTargetSet* targets = &m_targets[handlerClass]; 209 const EventTargetSet* targets = &m_targets[handlerClass];
210 for (EventTargetSet::const_iterator it = targets->begin(); it != targets ->end(); ++it) { 210 for (const auto& eventTarget : *targets) {
211 Node* node = it->key->toNode(); 211 Node* node = eventTarget.key->toNode();
212 LocalDOMWindow* window = it->key->toDOMWindow(); 212 LocalDOMWindow* window = eventTarget.key->toDOMWindow();
213 if (node && !visitor->isAlive(node)) { 213 if (node && !visitor->isAlive(node)) {
214 deadTargets.append(node); 214 deadTargets.append(node);
215 } else if (window && !visitor->isAlive(window)) { 215 } else if (window && !visitor->isAlive(window)) {
216 deadTargets.append(window); 216 deadTargets.append(window);
217 } 217 }
218 } 218 }
219 } 219 }
220 for (size_t i = 0; i < deadTargets.size(); ++i) 220 for (size_t i = 0; i < deadTargets.size(); ++i)
221 didRemoveAllEventHandlers(*deadTargets[i]); 221 didRemoveAllEventHandlers(*deadTargets[i]);
222 } 222 }
223 223
224 void EventHandlerRegistry::documentDetached(Document& document) 224 void EventHandlerRegistry::documentDetached(Document& document)
225 { 225 {
226 // Remove all event targets under the detached document. 226 // Remove all event targets under the detached document.
227 for (size_t handlerClassIndex = 0; handlerClassIndex < EventHandlerClassCoun t; ++handlerClassIndex) { 227 for (size_t handlerClassIndex = 0; handlerClassIndex < EventHandlerClassCoun t; ++handlerClassIndex) {
228 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(handlerC lassIndex); 228 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(handlerC lassIndex);
229 Vector<EventTarget*> targetsToRemove; 229 Vector<EventTarget*> targetsToRemove;
230 const EventTargetSet* targets = &m_targets[handlerClass]; 230 const EventTargetSet* targets = &m_targets[handlerClass];
231 for (EventTargetSet::const_iterator iter = targets->begin(); iter != tar gets->end(); ++iter) { 231 for (const auto& eventTarget : *targets) {
232 if (Node* node = iter->key->toNode()) { 232 if (Node* node = eventTarget.key->toNode()) {
233 for (Document* doc = &node->document(); doc; doc = doc->ownerEle ment() ? &doc->ownerElement()->document() : 0) { 233 for (Document* doc = &node->document(); doc; doc = doc->ownerEle ment() ? &doc->ownerElement()->document() : 0) {
234 if (doc == &document) { 234 if (doc == &document) {
235 targetsToRemove.append(iter->key); 235 targetsToRemove.append(eventTarget.key);
236 break; 236 break;
237 } 237 }
238 } 238 }
239 } else if (iter->key->toDOMWindow()) { 239 } else if (eventTarget.key->toDOMWindow()) {
240 // DOMWindows may outlive their documents, so we shouldn't remov e their handlers 240 // DOMWindows may outlive their documents, so we shouldn't remov e their handlers
241 // here. 241 // here.
242 } else { 242 } else {
243 ASSERT_NOT_REACHED(); 243 ASSERT_NOT_REACHED();
244 } 244 }
245 } 245 }
246 for (size_t i = 0; i < targetsToRemove.size(); ++i) 246 for (size_t i = 0; i < targetsToRemove.size(); ++i)
247 updateEventHandlerInternal(RemoveAll, handlerClass, targetsToRemove[ i]); 247 updateEventHandlerInternal(RemoveAll, handlerClass, targetsToRemove[ i]);
248 } 248 }
249 } 249 }
250 250
251 void EventHandlerRegistry::checkConsistency() const 251 void EventHandlerRegistry::checkConsistency() const
252 { 252 {
253 #if ENABLE(ASSERT) 253 #if ENABLE(ASSERT)
254 for (size_t i = 0; i < EventHandlerClassCount; ++i) { 254 for (size_t i = 0; i < EventHandlerClassCount; ++i) {
255 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i); 255 EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i);
256 const EventTargetSet* targets = &m_targets[handlerClass]; 256 const EventTargetSet* targets = &m_targets[handlerClass];
257 for (EventTargetSet::const_iterator iter = targets->begin(); iter != tar gets->end(); ++iter) { 257 for (const auto& eventTarget : *targets) {
258 if (Node* node = iter->key->toNode()) { 258 if (Node* node = eventTarget.key->toNode()) {
259 // See the comment for |documentDetached| if either of these ass ertions fails. 259 // See the comment for |documentDetached| if either of these ass ertions fails.
260 ASSERT(node->document().frameHost()); 260 ASSERT(node->document().frameHost());
261 ASSERT(node->document().frameHost() == &m_frameHost); 261 ASSERT(node->document().frameHost() == &m_frameHost);
262 } else if (LocalDOMWindow* window = iter->key->toDOMWindow()) { 262 } else if (LocalDOMWindow* window = eventTarget.key->toDOMWindow()) {
263 // If any of these assertions fail, LocalDOMWindow failed to unr egister its handlers 263 // If any of these assertions fail, LocalDOMWindow failed to unr egister its handlers
264 // properly. 264 // properly.
265 ASSERT(window->frame()); 265 ASSERT(window->frame());
266 ASSERT(window->frame()->host()); 266 ASSERT(window->frame()->host());
267 ASSERT(window->frame()->host() == &m_frameHost); 267 ASSERT(window->frame()->host() == &m_frameHost);
268 } 268 }
269 } 269 }
270 } 270 }
271 #endif // ENABLE(ASSERT) 271 #endif // ENABLE(ASSERT)
272 } 272 }
273 273
274 } // namespace blink 274 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698