| Index: third_party/WebKit/Source/core/dom/MutationObserver.h
|
| diff --git a/third_party/WebKit/Source/core/dom/MutationObserver.h b/third_party/WebKit/Source/core/dom/MutationObserver.h
|
| index deda1e3f73b5051d82d59060e8ce8ca228f3e4e3..698863e9beaf3e373afaffccb83d56447ed1cbdd 100644
|
| --- a/third_party/WebKit/Source/core/dom/MutationObserver.h
|
| +++ b/third_party/WebKit/Source/core/dom/MutationObserver.h
|
| @@ -53,12 +53,12 @@ class Node;
|
| typedef unsigned char MutationObserverOptions;
|
| typedef unsigned char MutationRecordDeliveryOptions;
|
|
|
| -using MutationObserverSet = WillBeHeapHashSet<RefPtrWillBeMember<MutationObserver>>;
|
| -using MutationObserverRegistrationSet = WillBeHeapHashSet<RawPtrWillBeWeakMember<MutationObserverRegistration>>;
|
| -using MutationObserverVector = WillBeHeapVector<RefPtrWillBeMember<MutationObserver>>;
|
| -using MutationRecordVector = WillBeHeapVector<RefPtrWillBeMember<MutationRecord>>;
|
| +using MutationObserverSet = HeapHashSet<Member<MutationObserver>>;
|
| +using MutationObserverRegistrationSet = HeapHashSet<WeakMember<MutationObserverRegistration>>;
|
| +using MutationObserverVector = HeapVector<Member<MutationObserver>>;
|
| +using MutationRecordVector = HeapVector<Member<MutationRecord>>;
|
|
|
| -class MutationObserver final : public RefCountedWillBeGarbageCollectedFinalized<MutationObserver>, public ScriptWrappable {
|
| +class MutationObserver final : public GarbageCollectedFinalized<MutationObserver>, public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| enum MutationType {
|
| @@ -79,7 +79,7 @@ public:
|
| CharacterDataOldValue = 1 << 6,
|
| };
|
|
|
| - static PassRefPtrWillBeRawPtr<MutationObserver> create(PassOwnPtrWillBeRawPtr<MutationCallback>);
|
| + static RawPtr<MutationObserver> create(RawPtr<MutationCallback>);
|
| static void resumeSuspendedObservers();
|
| static void deliverMutations();
|
|
|
| @@ -90,10 +90,10 @@ public:
|
| void disconnect();
|
| void observationStarted(MutationObserverRegistration*);
|
| void observationEnded(MutationObserverRegistration*);
|
| - void enqueueMutationRecord(PassRefPtrWillBeRawPtr<MutationRecord>);
|
| + void enqueueMutationRecord(RawPtr<MutationRecord>);
|
| void setHasTransientRegistration();
|
|
|
| - WillBeHeapHashSet<RawPtrWillBeMember<Node>> getObservedNodes() const;
|
| + HeapHashSet<Member<Node>> getObservedNodes() const;
|
|
|
| // Eagerly finalized as destructor accesses heap object members.
|
| EAGERLY_FINALIZE();
|
| @@ -102,11 +102,11 @@ public:
|
| private:
|
| struct ObserverLessThan;
|
|
|
| - explicit MutationObserver(PassOwnPtrWillBeRawPtr<MutationCallback>);
|
| + explicit MutationObserver(RawPtr<MutationCallback>);
|
| void deliver();
|
| bool shouldBeSuspended() const;
|
|
|
| - OwnPtrWillBeMember<MutationCallback> m_callback;
|
| + Member<MutationCallback> m_callback;
|
| MutationRecordVector m_records;
|
| MutationObserverRegistrationSet m_registrations;
|
| unsigned m_priority;
|
|
|