Refactor ScrollAnimatorMac to use CancellableTaskFactory

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

 /*
  * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 13 matching lines @@
  */
 
 #ifndef ScrollAnimatorMac_h
 #define ScrollAnimatorMac_h
 
 #include "platform/Timer.h"
 #include "platform/geometry/FloatPoint.h"
 #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;
 OBJC_CLASS BlinkScrollbarPainterControllerDelegate;
 OBJC_CLASS BlinkScrollbarPainterDelegate;
 
 typedef id ScrollbarPainterController;
 
 namespace blink {
 
@@ skipping 29 matching lines @@
 
 private:
     RetainPtr<id> m_scrollAnimationHelper;
     RetainPtr<BlinkScrollAnimationHelperDelegate> m_scrollAnimationHelperDelegate;
 
     RetainPtr<ScrollbarPainterController> m_scrollbarPainterController;
     RetainPtr<BlinkScrollbarPainterControllerDelegate> m_scrollbarPainterControllerDelegate;
     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;
     void scrollToOffsetWithoutAnimation(const FloatPoint&) override;
 
     void handleWheelEventPhase(PlatformWheelEventPhase) override;
 
     void cancelAnimation() override;
 
     void contentAreaWillPaint() const override;
@@ skipping 29 matching lines @@
     void immediateScrollTo(const FloatPoint&);
 
     bool m_haveScrolledSincePageLoad;
     bool m_needsScrollerStyleUpdate;
     IntRect m_visibleScrollerThumbRect;
 };
 
 } // namespace blink
 
 #endif // ScrollAnimatorMac_h