Oilpan: Prepare to move IdTargetObserver and IdTargetObserverRegistry to Oilpan heap.

Source/core/dom/IdTargetObserverRegistry.cpp

 /*
  * Copyright (C) 2012 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/dom/IdTargetObserverRegistry.h"
 
 #include "core/dom/IdTargetObserver.h"
 
 namespace WebCore {
 
-PassOwnPtr<IdTargetObserverRegistry> IdTargetObserverRegistry::create()
+PassOwnPtrWillBeRawPtr<IdTargetObserverRegistry> IdTargetObserverRegistry::create()
 {
-    return adoptPtr(new IdTargetObserverRegistry());
+    return adoptPtrWillBeNoop(new IdTargetObserverRegistry());
+}
+
+void IdTargetObserverRegistry::trace(Visitor* visitor)
+{
+    visitor->trace(m_registry);
+    visitor->trace(m_notifyingObserversInSet);
 }
 
 void IdTargetObserverRegistry::addObserver(const AtomicString& id, IdTargetObserver* observer)
 {
     if (id.isEmpty())
         return;
 
     IdToObserverSetMap::AddResult result = m_registry.add(id.impl(), nullptr);
     if (result.isNewEntry)
-        result.storedValue->value = adoptPtr(new ObserverSet());
+        result.storedValue->value = adoptPtrWillBeNoop(new ObserverSet());
 
     result.storedValue->value->add(observer);
 }
 
 void IdTargetObserverRegistry::removeObserver(const AtomicString& id, IdTargetObserver* observer)
 {
     if (id.isEmpty() || m_registry.isEmpty())
         return;
 
     IdToObserverSetMap::iterator iter = m_registry.find(id.impl());
 
     ObserverSet* set = iter->value.get();
     set->remove(observer);
     if (set->isEmpty() && set != m_notifyingObserversInSet)
         m_registry.remove(iter);
 }
 
 void IdTargetObserverRegistry::notifyObserversInternal(const AtomicString& id)
 {
     ASSERT(!id.isEmpty());
     ASSERT(!m_registry.isEmpty());
 
     m_notifyingObserversInSet = m_registry.get(id.impl());
     if (!m_notifyingObserversInSet)
         return;
 
-    Vector<IdTargetObserver*> copy;
+    WillBeHeapVector<RawPtrWillBeMember<IdTargetObserver> > copy;
     copyToVector(*m_notifyingObserversInSet, copy);
-    for (Vector<IdTargetObserver*>::const_iterator it = copy.begin(); it != copy.end(); ++it) {
+    for (WillBeHeapVector<RawPtrWillBeMember<IdTargetObserver> >::const_iterator it = copy.begin(); it != copy.end(); ++it) {
         if (m_notifyingObserversInSet->contains(*it))
             (*it)->idTargetChanged();
     }
 
     if (m_notifyingObserversInSet->isEmpty())
         m_registry.remove(id.impl());
 
-    m_notifyingObserversInSet = 0;
+    m_notifyingObserversInSet = nullptr;
 }
 
 bool IdTargetObserverRegistry::hasObservers(const AtomicString& id) const
 {
     if (id.isEmpty() || m_registry.isEmpty())
         return false;
     ObserverSet* set = m_registry.get(id.impl());
     return set && !set->isEmpty();
 }
 
 } // namespace WebCore