Refactor ScrollAnimatorMac to use CancellableTaskFactory

third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h

Index: third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h
diff --git a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h
index cd4e8d2170a21e9b1a63b7ef761ba86be2f7bac7..b132940ffd77f04b37d13460a6d44d9f0a0304ed 100644
--- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h
+++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h
@@ -31,7 +31,9 @@
 #include "platform/geometry/FloatSize.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/heap/Handle.h"
+#include "platform/scheduler/CancellableTaskFactory.h"
 #include "platform/scroll/ScrollAnimatorBase.h"
+#include "public/platform/WebTaskRunner.h"
 #include "wtf/RetainPtr.h"
 
 OBJC_CLASS BlinkScrollAnimationHelperDelegate;
@@ -81,11 +83,12 @@ private:
     RetainPtr<BlinkScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate;
     RetainPtr<BlinkScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate;
 
-    void initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>*);
-    Timer<ScrollAnimatorMac> m_initialScrollbarPaintTimer;
+    void initialScrollbarPaintTask();
+    OwnPtr<CancellableTaskFactory> m_initialScrollbarPaintTaskFactory;
 
-    void sendContentAreaScrolledTimerFired(Timer<ScrollAnimatorMac>*);
-    Timer<ScrollAnimatorMac> m_sendContentAreaScrolledTimer;
+    void sendContentAreaScrolledTask();
+    OwnPtr<CancellableTaskFactory> m_sendContentAreaScrolledTaskFactory;
+    OwnPtr<WebTaskRunner> m_taskRunner;
     FloatSize m_contentAreaScrolledTimerScrollDelta;
 
     ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGranularity, float step, float delta) override;