| Index: third_party/WebKit/Source/platform/LifecycleNotifier.h
|
| diff --git a/third_party/WebKit/Source/platform/LifecycleNotifier.h b/third_party/WebKit/Source/platform/LifecycleNotifier.h
|
| index d3a30896905d91f97a88a483344259de873ed52f..7e654cf12b6e6b4a5c4ca81f74af825e6d8f2bba 100644
|
| --- a/third_party/WebKit/Source/platform/LifecycleNotifier.h
|
| +++ b/third_party/WebKit/Source/platform/LifecycleNotifier.h
|
| @@ -34,7 +34,7 @@
|
| namespace blink {
|
|
|
| template<typename T, typename Observer>
|
| -class LifecycleNotifier : public virtual WillBeGarbageCollectedMixin {
|
| +class LifecycleNotifier : public virtual GarbageCollectedMixin {
|
| public:
|
| virtual ~LifecycleNotifier();
|
|
|
| @@ -72,7 +72,7 @@ protected:
|
| IterationType m_iterating;
|
|
|
| protected:
|
| - using ObserverSet = WillBeHeapHashSet<RawPtrWillBeWeakMember<Observer>>;
|
| + using ObserverSet = HeapHashSet<WeakMember<Observer>>;
|
|
|
| ObserverSet m_observers;
|
|
|
| @@ -106,7 +106,7 @@ inline void LifecycleNotifier<T, Observer>::notifyContextDestroyed()
|
| return;
|
|
|
| TemporaryChange<IterationType> scope(m_iterating, IteratingOverAll);
|
| - Vector<RawPtrWillBeUntracedMember<Observer>> snapshotOfObservers;
|
| + Vector<UntracedMember<Observer>> snapshotOfObservers;
|
| copyToVector(m_observers, snapshotOfObservers);
|
| for (Observer* observer : snapshotOfObservers) {
|
| // FIXME: Oilpan: At the moment, it's possible that the Observer is
|
|
|