Index: Source/core/dom/MutationObserver.h |
diff --git a/Source/core/dom/MutationObserver.h b/Source/core/dom/MutationObserver.h |
index 5ae64cd750d16447df4b19d80783d6cfa503265b..ea611ac38aa1f5366e79fa6d72452a17e95b8cd5 100644 |
--- a/Source/core/dom/MutationObserver.h |
+++ b/Source/core/dom/MutationObserver.h |
@@ -53,16 +53,14 @@ class Node; |
typedef unsigned char MutationObserverOptions; |
typedef unsigned char MutationRecordDeliveryOptions; |
-typedef WillBeHeapHashSet<RefPtrWillBeMember<MutationObserver> > MutationObserverSet; |
-typedef WillBeHeapHashSet<RawPtrWillBeWeakMember<MutationObserverRegistration> > MutationObserverRegistrationSet; |
-typedef WillBeHeapVector<RefPtrWillBeMember<MutationObserver> > MutationObserverVector; |
-typedef WillBeHeapVector<RefPtrWillBeMember<MutationRecord> > MutationRecordVector; |
+using MutationObserverSet = WillBeHeapHashSet<RefPtrWillBeMember<MutationObserver>>; |
+using MutationObserverRegistrationSet = WillBeHeapHashSet<RawPtrWillBeWeakMember<MutationObserverRegistration>>; |
+using MutationObserverVector = WillBeHeapVector<RefPtrWillBeMember<MutationObserver>>; |
+using MutationRecordVector = WillBeHeapVector<RefPtrWillBeMember<MutationRecord>>; |
class MutationObserver final : public RefCountedWillBeGarbageCollectedFinalized<MutationObserver>, public ScriptWrappable { |
DEFINE_WRAPPERTYPEINFO(); |
-#if ENABLE(OILPAN) |
- USING_PRE_FINALIZER(MutationObserver, dispose); |
-#endif |
+ WILL_BE_USING_PRE_FINALIZER(MutationObserver, dispose); |
public: |
enum MutationType { |
ChildList = 1 << 0, |
@@ -89,7 +87,7 @@ public: |
~MutationObserver(); |
void observe(Node*, const MutationObserverInit&, ExceptionState&); |
- WillBeHeapVector<RefPtrWillBeMember<MutationRecord> > takeRecords(); |
+ MutationRecordVector takeRecords(); |
void disconnect(); |
void observationStarted(MutationObserverRegistration*); |
void observationEnded(MutationObserverRegistration*); |
@@ -99,7 +97,6 @@ public: |
WillBeHeapHashSet<RawPtrWillBeMember<Node> > getObservedNodes() const; |
void trace(Visitor*); |
- void dispose(); |
private: |
struct ObserverLessThan; |
@@ -108,6 +105,8 @@ private: |
void deliver(); |
bool shouldBeSuspended() const; |
+ void dispose(); |
+ |
OwnPtrWillBeMember<MutationCallback> m_callback; |
MutationRecordVector m_records; |
MutationObserverRegistrationSet m_registrations; |