| Index: third_party/WebKit/Source/core/animation/Animation.h
|
| diff --git a/third_party/WebKit/Source/core/animation/Animation.h b/third_party/WebKit/Source/core/animation/Animation.h
|
| index 0d88db13b5c0f721804a0b73182c0bae192caae1..d98274da97d7ae0f3d3bd846efcf088936855f35 100644
|
| --- a/third_party/WebKit/Source/core/animation/Animation.h
|
| +++ b/third_party/WebKit/Source/core/animation/Animation.h
|
| @@ -58,7 +58,7 @@ class CORE_EXPORT Animation final
|
| , public WebCompositorAnimationPlayerClient {
|
| DEFINE_WRAPPERTYPEINFO();
|
| REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(Animation);
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Animation);
|
| + USING_GARBAGE_COLLECTED_MIXIN(Animation);
|
| public:
|
| enum AnimationPlayState {
|
| Idle,
|
| @@ -178,8 +178,8 @@ public:
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| protected:
|
| - bool dispatchEventInternal(PassRefPtrWillBeRawPtr<Event>) override;
|
| - bool addEventListenerInternal(const AtomicString& eventType, PassRefPtrWillBeRawPtr<EventListener>, const EventListenerOptions&) override;
|
| + bool dispatchEventInternal(RawPtr<Event>) override;
|
| + bool addEventListenerInternal(const AtomicString& eventType, RawPtr<EventListener>, const EventListenerOptions&) override;
|
|
|
| private:
|
| Animation(ExecutionContext*, AnimationTimeline&, AnimationEffect*);
|
| @@ -247,7 +247,7 @@ private:
|
| // Holds a 'finished' event queued for asynchronous dispatch via the
|
| // ScriptedAnimationController. This object remains active until the
|
| // event is actually dispatched.
|
| - RefPtrWillBeMember<Event> m_pendingFinishedEvent;
|
| + Member<Event> m_pendingFinishedEvent;
|
|
|
| enum CompositorAction {
|
| None,
|
|
|