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

Side by Side Diff: Source/core/dom/MutationObserver.cpp

Issue 796913002: Use C++11 range-based loop for core/clipboard, core/dom and core/testing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rename variable Created 6 years 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 records.swap(m_records); 141 records.swap(m_records);
142 InspectorInstrumentation::didClearAllMutationRecords(m_callback->executionCo ntext(), this); 142 InspectorInstrumentation::didClearAllMutationRecords(m_callback->executionCo ntext(), this);
143 return records; 143 return records;
144 } 144 }
145 145
146 void MutationObserver::disconnect() 146 void MutationObserver::disconnect()
147 { 147 {
148 m_records.clear(); 148 m_records.clear();
149 InspectorInstrumentation::didClearAllMutationRecords(m_callback->executionCo ntext(), this); 149 InspectorInstrumentation::didClearAllMutationRecords(m_callback->executionCo ntext(), this);
150 MutationObserverRegistrationSet registrations(m_registrations); 150 MutationObserverRegistrationSet registrations(m_registrations);
151 for (MutationObserverRegistrationSet::iterator iter = registrations.begin(); iter != registrations.end(); ++iter) 151 for (auto registration : registrations)
dcheng 2014/12/16 19:52:51 Similar comment for all the remaining autos. I wou
152 (*iter)->unregister(); 152 registration->unregister();
153 ASSERT(m_registrations.isEmpty()); 153 ASSERT(m_registrations.isEmpty());
154 } 154 }
155 155
156 void MutationObserver::observationStarted(MutationObserverRegistration* registra tion) 156 void MutationObserver::observationStarted(MutationObserverRegistration* registra tion)
157 { 157 {
158 ASSERT(!m_registrations.contains(registration)); 158 ASSERT(!m_registrations.contains(registration));
159 m_registrations.add(registration); 159 m_registrations.add(registration);
160 } 160 }
161 161
162 void MutationObserver::observationEnded(MutationObserverRegistration* registrati on) 162 void MutationObserver::observationEnded(MutationObserverRegistration* registrati on)
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 195
196 void MutationObserver::setHasTransientRegistration() 196 void MutationObserver::setHasTransientRegistration()
197 { 197 {
198 ASSERT(isMainThread()); 198 ASSERT(isMainThread());
199 activateObserver(this); 199 activateObserver(this);
200 } 200 }
201 201
202 WillBeHeapHashSet<RawPtrWillBeMember<Node> > MutationObserver::getObservedNodes( ) const 202 WillBeHeapHashSet<RawPtrWillBeMember<Node> > MutationObserver::getObservedNodes( ) const
203 { 203 {
204 WillBeHeapHashSet<RawPtrWillBeMember<Node> > observedNodes; 204 WillBeHeapHashSet<RawPtrWillBeMember<Node> > observedNodes;
205 for (MutationObserverRegistrationSet::const_iterator iter = m_registrations. begin(); iter != m_registrations.end(); ++iter) 205 for (const auto& registration : m_registrations)
206 (*iter)->addRegistrationNodesToSet(observedNodes); 206 registration->addRegistrationNodesToSet(observedNodes);
207 return observedNodes; 207 return observedNodes;
208 } 208 }
209 209
210 bool MutationObserver::shouldBeSuspended() const 210 bool MutationObserver::shouldBeSuspended() const
211 { 211 {
212 return m_callback->executionContext() && m_callback->executionContext()->act iveDOMObjectsAreSuspended(); 212 return m_callback->executionContext() && m_callback->executionContext()->act iveDOMObjectsAreSuspended();
213 } 213 }
214 214
215 void MutationObserver::deliver() 215 void MutationObserver::deliver()
216 { 216 {
217 ASSERT(!shouldBeSuspended()); 217 ASSERT(!shouldBeSuspended());
218 218
219 // Calling clearTransientRegistrations() can modify m_registrations, so it's necessary 219 // Calling clearTransientRegistrations() can modify m_registrations, so it's necessary
220 // to make a copy of the transient registrations before operating on them. 220 // to make a copy of the transient registrations before operating on them.
221 WillBeHeapVector<RawPtrWillBeMember<MutationObserverRegistration>, 1> transi entRegistrations; 221 WillBeHeapVector<RawPtrWillBeMember<MutationObserverRegistration>, 1> transi entRegistrations;
222 for (MutationObserverRegistrationSet::iterator iter = m_registrations.begin( ); iter != m_registrations.end(); ++iter) { 222 for (auto registration : m_registrations) {
223 if ((*iter)->hasTransientRegistrations()) 223 if (registration->hasTransientRegistrations())
224 transientRegistrations.append(*iter); 224 transientRegistrations.append(registration);
225 } 225 }
226 for (size_t i = 0; i < transientRegistrations.size(); ++i) 226 for (size_t i = 0; i < transientRegistrations.size(); ++i)
227 transientRegistrations[i]->clearTransientRegistrations(); 227 transientRegistrations[i]->clearTransientRegistrations();
228 228
229 if (m_records.isEmpty()) 229 if (m_records.isEmpty())
230 return; 230 return;
231 231
232 MutationRecordVector records; 232 MutationRecordVector records;
233 records.swap(m_records); 233 records.swap(m_records);
234 234
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 270
271 void MutationObserver::trace(Visitor* visitor) 271 void MutationObserver::trace(Visitor* visitor)
272 { 272 {
273 #if ENABLE(OILPAN) 273 #if ENABLE(OILPAN)
274 visitor->trace(m_records); 274 visitor->trace(m_records);
275 visitor->trace(m_registrations); 275 visitor->trace(m_registrations);
276 #endif 276 #endif
277 } 277 }
278 278
279 } // namespace blink 279 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698