| Index: third_party/WebKit/Source/core/dom/IdTargetObserverRegistry.h
|
| diff --git a/third_party/WebKit/Source/core/dom/IdTargetObserverRegistry.h b/third_party/WebKit/Source/core/dom/IdTargetObserverRegistry.h
|
| index ddb604174c20f255e8684d7bb0c8486b8016b603..10db431a5b0a4347869fbf0bd88c921c764eefd5 100644
|
| --- a/third_party/WebKit/Source/core/dom/IdTargetObserverRegistry.h
|
| +++ b/third_party/WebKit/Source/core/dom/IdTargetObserverRegistry.h
|
| @@ -36,12 +36,11 @@ namespace blink {
|
|
|
| class IdTargetObserver;
|
|
|
| -class IdTargetObserverRegistry final : public NoBaseWillBeGarbageCollectedFinalized<IdTargetObserverRegistry> {
|
| +class IdTargetObserverRegistry final : public GarbageCollectedFinalized<IdTargetObserverRegistry> {
|
| WTF_MAKE_NONCOPYABLE(IdTargetObserverRegistry);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(IdTargetObserverRegistry);
|
| friend class IdTargetObserver;
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<IdTargetObserverRegistry> create();
|
| + static RawPtr<IdTargetObserverRegistry> create();
|
| DECLARE_TRACE();
|
| void notifyObservers(const AtomicString& id);
|
| bool hasObservers(const AtomicString& id) const;
|
| @@ -52,10 +51,10 @@ private:
|
| void removeObserver(const AtomicString& id, IdTargetObserver*);
|
| void notifyObserversInternal(const AtomicString& id);
|
|
|
| - typedef WillBeHeapHashSet<RawPtrWillBeMember<IdTargetObserver>> ObserverSet;
|
| - typedef WillBeHeapHashMap<StringImpl*, OwnPtrWillBeMember<ObserverSet>> IdToObserverSetMap;
|
| + typedef HeapHashSet<Member<IdTargetObserver>> ObserverSet;
|
| + typedef HeapHashMap<StringImpl*, Member<ObserverSet>> IdToObserverSetMap;
|
| IdToObserverSetMap m_registry;
|
| - RawPtrWillBeMember<ObserverSet> m_notifyingObserversInSet;
|
| + Member<ObserverSet> m_notifyingObserversInSet;
|
| };
|
|
|
| inline void IdTargetObserverRegistry::notifyObservers(const AtomicString& id)
|
|
|