Refactor Timer classes in preparation for landing FrameTimers.

third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/svg/graphics/SVGImage.h"
 
 #include "core/svg/graphics/SVGImageChromeClient.h"
 #include "platform/SharedBuffer.h"
 #include "platform/Timer.h"
 #include "platform/geometry/FloatRect.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/utils/SkNullCanvas.h"
+#include "wtf/PtrUtil.h"
 
 namespace blink {
 namespace {
 
 class MockTaskRunner : public WebTaskRunner {
 public:
     void setTime(double newTime) { m_time = newTime; }
 
     MockTaskRunner()
     : WebTaskRunner(), m_time(0.0), m_currentTask(nullptr)
@@ skipping 16 matching lines @@
     }
     bool runsTasksOnCurrentThread() override { return true; }
     std::unique_ptr<WebTaskRunner> clone() override { return nullptr; }
     double virtualTimeSeconds() const override { return 0.0; }
     double monotonicallyIncreasingVirtualTimeSeconds() const override { return m_time; }
 
     double m_time;
     Task* m_currentTask;
 };
 
-class MockTimer : public Timer<SVGImageChromeClient> {
-    typedef void (SVGImageChromeClient::*TimerFiredFunction)(Timer*);
+class MockTimer : public TaskRunnerTimer<SVGImageChromeClient> {
 public:
+    using TimerFiredFunction = typename TaskRunnerTimer<SVGImageChromeClient>::TimerFiredFunction;
+
     MockTimer(SVGImageChromeClient* o, TimerFiredFunction f)
-    : Timer<SVGImageChromeClient>(o, f, &m_taskRunner)
+        : TaskRunnerTimer(&m_taskRunner, o, f)
     {
     }
 
     void fire()
     {
-        this->Timer<SVGImageChromeClient>::fired();
+        fired();
         stop();
     }
 
     void setTime(double newTime)
     {
         m_taskRunner.setTime(newTime);
     }
 
 private:
     MockTaskRunner m_taskRunner;
@@ skipping 63 matching lines @@
     "</style>"
     "<path class='spinner' fill='none' d='M 8,1.125 A 6.875,6.875 0 1 1 1.125,8' stroke-width='2' stroke='blue'/>"
     "</svg>";
 
 TEST_F(SVGImageTest, TimelineSuspendAndResume)
 {
     const bool shouldPause = true;
     load(kAnimatedDocument, shouldPause);
     SVGImageChromeClient& chromeClient = image().chromeClientForTesting();
     MockTimer* timer = new MockTimer(&chromeClient, &SVGImageChromeClient::animationTimerFired);
-    chromeClient.setTimer(timer);
+    chromeClient.setTimer(wrapUnique(timer));
 
     // Simulate a draw. Cause a frame (timer) to be scheduled.
     pumpFrame();
     EXPECT_TRUE(image().hasAnimations());
     EXPECT_TRUE(timer->isActive());
 
     // Fire the timer/trigger a frame update. Since the observer always returns
     // true for shouldPauseAnimation, this will result in the timeline being
     // suspended.
     timer->fire();
     EXPECT_TRUE(chromeClient.isSuspended());
     EXPECT_FALSE(timer->isActive());
 
     // Simulate a draw. This should resume the animation again.
     pumpFrame();
     EXPECT_TRUE(timer->isActive());
     EXPECT_FALSE(chromeClient.isSuspended());
 }
 
 TEST_F(SVGImageTest, ResetAnimation)
 {
     const bool shouldPause = false;
     load(kAnimatedDocument, shouldPause);
     SVGImageChromeClient& chromeClient = image().chromeClientForTesting();
     MockTimer* timer = new MockTimer(&chromeClient, &SVGImageChromeClient::animationTimerFired);
-    chromeClient.setTimer(timer);
+    chromeClient.setTimer(wrapUnique(timer));
 
     // Simulate a draw. Cause a frame (timer) to be scheduled.
     pumpFrame();
     EXPECT_TRUE(image().hasAnimations());
     EXPECT_TRUE(timer->isActive());
 
     // Reset the animation. This will suspend the timeline but not cancel the
     // timer.
     image().resetAnimation();
     EXPECT_TRUE(chromeClient.isSuspended());
     EXPECT_TRUE(timer->isActive());
 
     // Fire the timer/trigger a frame update. The timeline will remain
     // suspended and no frame will be scheduled.
     timer->fire();
     EXPECT_TRUE(chromeClient.isSuspended());
     EXPECT_FALSE(timer->isActive());
 
     // Simulate a draw. This should resume the animation again.
     pumpFrame();
     EXPECT_FALSE(chromeClient.isSuspended());
     EXPECT_TRUE(timer->isActive());
 }
 
 } // namespace blink