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

Unified Diff: Source/core/dom/MutationObserver.cpp

Issue 257513002: Add synonyms for collection types over MutationObserver-related types. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/MutationObserver.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/MutationObserver.cpp
diff --git a/Source/core/dom/MutationObserver.cpp b/Source/core/dom/MutationObserver.cpp
index cba9438e48d1564599b61fbecda8837d7c851a0c..d8ea3ddffc2835eb2ad3c661defa1b4dfb5b6f56 100644
--- a/Source/core/dom/MutationObserver.cpp
+++ b/Source/core/dom/MutationObserver.cpp
@@ -140,9 +140,9 @@ void MutationObserver::observe(Node* node, const Dictionary& optionsDictionary,
node->registerMutationObserver(*this, options, attributeFilter);
}
-WillBeHeapVector<RefPtrWillBeMember<MutationRecord> > MutationObserver::takeRecords()
+MutationRecordVector MutationObserver::takeRecords()
{
- WillBeHeapVector<RefPtrWillBeMember<MutationRecord> > records;
+ MutationRecordVector records;
records.swap(m_records);
InspectorInstrumentation::didClearAllMutationRecords(m_callback->executionContext(), this);
return records;
@@ -152,8 +152,8 @@ void MutationObserver::disconnect()
{
m_records.clear();
InspectorInstrumentation::didClearAllMutationRecords(m_callback->executionContext(), this);
- WillBeHeapHashSet<RawPtrWillBeMember<MutationObserverRegistration> > registrations(m_registrations);
- for (WillBeHeapHashSet<RawPtrWillBeMember<MutationObserverRegistration> >::iterator iter = registrations.begin(); iter != registrations.end(); ++iter)
+ MutationObserverRegistrationSet registrations(m_registrations);
+ for (MutationObserverRegistrationSet::iterator iter = registrations.begin(); iter != registrations.end(); ++iter)
(*iter)->unregister();
ASSERT(m_registrations.isEmpty());
}
@@ -170,8 +170,6 @@ void MutationObserver::observationEnded(MutationObserverRegistration* registrati
m_registrations.remove(registration);
}
-typedef WillBeHeapHashSet<RefPtrWillBeMember<MutationObserver> > MutationObserverSet;
-
static MutationObserverSet& activeMutationObservers()
{
#if ENABLE(OILPAN)
@@ -219,7 +217,7 @@ void MutationObserver::setHasTransientRegistration()
HashSet<Node*> MutationObserver::getObservedNodes() const
{
HashSet<Node*> observedNodes;
- for (WillBeHeapHashSet<RawPtrWillBeMember<MutationObserverRegistration> >::const_iterator iter = m_registrations.begin(); iter != m_registrations.end(); ++iter)
+ for (MutationObserverRegistrationSet::const_iterator iter = m_registrations.begin(); iter != m_registrations.end(); ++iter)
(*iter)->addRegistrationNodesToSet(observedNodes);
return observedNodes;
}
@@ -236,7 +234,7 @@ void MutationObserver::deliver()
// Calling clearTransientRegistrations() can modify m_registrations, so it's necessary
// to make a copy of the transient registrations before operating on them.
WillBeHeapVector<RawPtrWillBeMember<MutationObserverRegistration>, 1> transientRegistrations;
- for (WillBeHeapHashSet<RawPtrWillBeMember<MutationObserverRegistration> >::iterator iter = m_registrations.begin(); iter != m_registrations.end(); ++iter) {
+ for (MutationObserverRegistrationSet::iterator iter = m_registrations.begin(); iter != m_registrations.end(); ++iter) {
if ((*iter)->hasTransientRegistrations())
transientRegistrations.append(*iter);
}
@@ -246,7 +244,7 @@ void MutationObserver::deliver()
if (m_records.isEmpty())
return;
- WillBeHeapVector<RefPtrWillBeMember<MutationRecord> > records;
+ MutationRecordVector records;
records.swap(m_records);
InspectorInstrumentation::willDeliverMutationRecords(m_callback->executionContext(), this);
@@ -260,7 +258,7 @@ void MutationObserver::resumeSuspendedObservers()
if (suspendedMutationObservers().isEmpty())
return;
- WillBeHeapVector<RefPtrWillBeMember<MutationObserver> > suspended;
+ MutationObserverVector suspended;
copyToVector(suspendedMutationObservers(), suspended);
for (size_t i = 0; i < suspended.size(); ++i) {
if (suspended[i]->canDeliver()) {
@@ -273,7 +271,7 @@ void MutationObserver::resumeSuspendedObservers()
void MutationObserver::deliverMutations()
{
ASSERT(isMainThread());
- WillBeHeapVector<RefPtrWillBeMember<MutationObserver> > observers;
+ MutationObserverVector observers;
copyToVector(activeMutationObservers(), observers);
activeMutationObservers().clear();
std::sort(observers.begin(), observers.end(), ObserverLessThan());
« no previous file with comments | « Source/core/dom/MutationObserver.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698