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

Source/core/dom/IdTargetObserverRegistry.h

 /*
  * 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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef IdTargetObserverRegistry_h
 #define IdTargetObserverRegistry_h
 
+#include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/text/StringHash.h"
 
 namespace WebCore {
 
 class IdTargetObserver;
 
-class IdTargetObserverRegistry {
-    WTF_MAKE_NONCOPYABLE(IdTargetObserverRegistry); WTF_MAKE_FAST_ALLOCATED;
+class IdTargetObserverRegistry : public NoBaseWillBeGarbageCollectedFinalized<IdTargetObserverRegistry> {

[zerny-chromium, 2014/05/09 08:01:49]

FINAL

[tkent, 2014/05/09 09:37:20]

Done.

+    WTF_MAKE_NONCOPYABLE(IdTargetObserverRegistry);
+    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
     friend class IdTargetObserver;
 public:
-    static PassOwnPtr<IdTargetObserverRegistry> create();
+    static PassOwnPtrWillBeRawPtr<IdTargetObserverRegistry> create();
+    void trace(Visitor*);
     void notifyObservers(const AtomicString& id);
     bool hasObservers(const AtomicString& id) const;
 
 private:
-    IdTargetObserverRegistry() : m_notifyingObserversInSet(0) { }
+    IdTargetObserverRegistry() : m_notifyingObserversInSet(nullptr) { }
     void addObserver(const AtomicString& id, IdTargetObserver*);
     void removeObserver(const AtomicString& id, IdTargetObserver*);
     void notifyObserversInternal(const AtomicString& id);
 
-    typedef HashSet<IdTargetObserver*> ObserverSet;
-    typedef HashMap<StringImpl*, OwnPtr<ObserverSet> > IdToObserverSetMap;
+    typedef WillBeHeapHashSet<RawPtrWillBeMember<IdTargetObserver> > ObserverSet;

[haraken, 2014/05/09 07:01:35]

Just to confirm: This is a Member, not a WeakMember, right? As far as I read the
code, the IdTargetObserverRegistry is owned by a TreeScope and all observers are
guaranteed to be in the TreeScope. So the IdTargetObserverRegistry and the
observers should die together, so it looks OK to use a Member here.

[tkent, 2014/05/09 09:37:20]

Right.  This cycle (IdTargetObserverRegistry -> ObserverSet -> IdTargetObserver
-> IdTargetObserver) should have no problem because everything is in a single
document, and an IdTargetObserver should be unregistered when it's removed from
a document tree.

+    typedef WillBeHeapHashMap<StringImpl*, OwnPtrWillBeMember<ObserverSet> > IdToObserverSetMap;
     IdToObserverSetMap m_registry;
-    ObserverSet* m_notifyingObserversInSet;
+    RawPtrWillBeMember<ObserverSet> m_notifyingObserversInSet;
 };
 
 inline void IdTargetObserverRegistry::notifyObservers(const AtomicString& id)
 {
     ASSERT(!m_notifyingObserversInSet);
     if (id.isEmpty() || m_registry.isEmpty())
         return;
     IdTargetObserverRegistry::notifyObserversInternal(id);
 }
 
 } // namespace WebCore
 
 #endif // IdTargetObserverRegistry_h