Add synonyms for collection types over MutationObserver-related types.

Source/core/dom/MutationObserver.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 122 matching lines @@
     }
 
     if (!(options & (Attributes | CharacterData | ChildList))) {
         exceptionState.throwTypeError("The options object must set at least one of 'attributes', 'characterData', or 'childList' to true.");
         return;
     }
 
     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;
 }
 
 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());
 }
 
 void MutationObserver::observationStarted(MutationObserverRegistration* registration)
 {
     ASSERT(!m_registrations.contains(registration));
     m_registrations.add(registration);
 }
 
 void MutationObserver::observationEnded(MutationObserverRegistration* registration)
 {
     ASSERT(m_registrations.contains(registration));
     m_registrations.remove(registration);
 }
 
-typedef WillBeHeapHashSet<RefPtrWillBeMember<MutationObserver> > MutationObserverSet;
-
 static MutationObserverSet& activeMutationObservers()
 {
 #if ENABLE(OILPAN)
     DEFINE_STATIC_LOCAL(Persistent<MutationObserverSet>, activeObservers, (new MutationObserverSet()));
     return *activeObservers;
 #else
     DEFINE_STATIC_LOCAL(MutationObserverSet, activeObservers, ());
     return activeObservers;
 #endif
 }
@@ skipping 27 matching lines @@
 
 void MutationObserver::setHasTransientRegistration()
 {
     ASSERT(isMainThread());
     activateObserver(this);
 }
 
 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;
 }
 
 bool MutationObserver::canDeliver()
 {
     return !m_callback->executionContext()->activeDOMObjectsAreSuspended();
 }
 
 void MutationObserver::deliver()
 {
     ASSERT(canDeliver());
 
     // 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);
     }
     for (size_t i = 0; i < transientRegistrations.size(); ++i)
         transientRegistrations[i]->clearTransientRegistrations();
 
     if (m_records.isEmpty())
         return;
 
-    WillBeHeapVector<RefPtrWillBeMember<MutationRecord> > records;
+    MutationRecordVector records;
     records.swap(m_records);
 
     InspectorInstrumentation::willDeliverMutationRecords(m_callback->executionContext(), this);
     m_callback->call(records, this);
     InspectorInstrumentation::didDeliverMutationRecords(m_callback->executionContext());
 }
 
 void MutationObserver::resumeSuspendedObservers()
 {
     ASSERT(isMainThread());
     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()) {
             suspendedMutationObservers().remove(suspended[i]);
             activateObserver(suspended[i]);
         }
     }
 }
 
 void MutationObserver::deliverMutations()
 {
     ASSERT(isMainThread());
-    WillBeHeapVector<RefPtrWillBeMember<MutationObserver> > observers;
+    MutationObserverVector observers;
     copyToVector(activeMutationObservers(), observers);
     activeMutationObservers().clear();
     std::sort(observers.begin(), observers.end(), ObserverLessThan());
     for (size_t i = 0; i < observers.size(); ++i) {
         if (observers[i]->canDeliver())
             observers[i]->deliver();
         else
             suspendedMutationObservers().add(observers[i]);
     }
 }
 
 void MutationObserver::trace(Visitor* visitor)
 {
     visitor->trace(m_records);
     visitor->trace(m_registrations);
 }
 
 } // namespace WebCore