| Index: third_party/WebKit/Source/core/dom/ScriptedAnimationController.h
|
| diff --git a/third_party/WebKit/Source/core/dom/ScriptedAnimationController.h b/third_party/WebKit/Source/core/dom/ScriptedAnimationController.h
|
| index 81406ee59daee012b94da783d2ef55423e216856..1b574f35b7eb0b54004bd136751b0d7efd31da23 100644
|
| --- a/third_party/WebKit/Source/core/dom/ScriptedAnimationController.h
|
| +++ b/third_party/WebKit/Source/core/dom/ScriptedAnimationController.h
|
| @@ -43,12 +43,11 @@ class EventTarget;
|
| class FrameRequestCallback;
|
| class MediaQueryListListener;
|
|
|
| -class ScriptedAnimationController : public RefCountedWillBeGarbageCollected<ScriptedAnimationController> {
|
| - DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ScriptedAnimationController);
|
| +class ScriptedAnimationController : public GarbageCollected<ScriptedAnimationController> {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<ScriptedAnimationController> create(Document* document)
|
| + static RawPtr<ScriptedAnimationController> create(Document* document)
|
| {
|
| - return adoptRefWillBeNoop(new ScriptedAnimationController(document));
|
| + return new ScriptedAnimationController(document);
|
| }
|
|
|
| DECLARE_TRACE();
|
| @@ -60,9 +59,9 @@ public:
|
| void cancelCallback(CallbackId);
|
| void serviceScriptedAnimations(double monotonicTimeNow);
|
|
|
| - void enqueueEvent(PassRefPtrWillBeRawPtr<Event>);
|
| - void enqueuePerFrameEvent(PassRefPtrWillBeRawPtr<Event>);
|
| - void enqueueMediaQueryChangeListeners(WillBeHeapVector<RefPtrWillBeMember<MediaQueryListListener>>&);
|
| + void enqueueEvent(RawPtr<Event>);
|
| + void enqueuePerFrameEvent(RawPtr<Event>);
|
| + void enqueueMediaQueryChangeListeners(HeapVector<Member<MediaQueryListListener>>&);
|
|
|
| void suspend();
|
| void resume();
|
| @@ -79,12 +78,12 @@ private:
|
|
|
| bool hasScheduledItems() const;
|
|
|
| - RawPtrWillBeMember<Document> m_document;
|
| + Member<Document> m_document;
|
| FrameRequestCallbackCollection m_callbackCollection;
|
| int m_suspendCount;
|
| - WillBeHeapVector<RefPtrWillBeMember<Event>> m_eventQueue;
|
| - WillBeHeapListHashSet<std::pair<RawPtrWillBeMember<const EventTarget>, const StringImpl*>> m_perFrameEvents;
|
| - using MediaQueryListListeners = WillBeHeapListHashSet<RefPtrWillBeMember<MediaQueryListListener>>;
|
| + HeapVector<Member<Event>> m_eventQueue;
|
| + HeapListHashSet<std::pair<Member<const EventTarget>, const StringImpl*>> m_perFrameEvents;
|
| + using MediaQueryListListeners = HeapListHashSet<Member<MediaQueryListListener>>;
|
| MediaQueryListListeners m_mediaQueryListListeners;
|
| };
|
|
|
|
|