Move throttling of background timers into the renderer scheduler

third_party/WebKit/Source/platform/TimerTest.cpp

 // Copyright 2015 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 "config.h"
 #include "platform/Timer.h"
 
 #include "public/platform/Platform.h"
 #include "public/platform/WebScheduler.h"
 #include "public/platform/WebThread.h"
@@ skipping 117 matching lines @@
     {
         return &m_timerWebTaskRunner;
     }
 
     WebTaskRunner* loadingTaskRunner() override
     {
         ASSERT_NOT_REACHED();
         return nullptr;
     }
 
-    void postTimerTaskAt(const WebTraceLocation&, WebTaskRunner::Task* task, double monotonicTime) override
-    {
-        m_timerTasks.push(DelayedTask(task, (monotonicTime - monotonicallyIncreasingTime()) * 1000));
-    }
-
     void runUntilIdle()
     {
         while (m_timerTasks.size()) {
             gCurrentTimeSecs = m_timerTasks.top().runTimeSeconds();
             m_timerTasks.top().run();
             m_timerTasks.pop();
         }
     }
 
     void runUntilIdleOrDeadlinePassed(double deadline)
@@ skipping 543 matching lines @@
 {
     Timer<TimerTest> timer(this, &TimerTest::countingTask);
     timer.startRepeating(20, BLINK_FROM_HERE);
 
     EXPECT_FLOAT_EQ(20.0, timer.repeatInterval());
 }
 
 TEST_F(TimerTest, AugmentRepeatInterval)
 {
     Timer<TimerTest> timer(this, &TimerTest::countingTask);
+    fprintf(stderr, "m_startTime = %f\n", m_startTime);

[Sami, 2015/11/17 10:12:21]

Might want to remove this :)

[alex clarke (OOO till 29th), 2015/11/23 17:13:46]

Done.

     timer.startRepeating(10, BLINK_FROM_HERE);
     EXPECT_FLOAT_EQ(10.0, timer.repeatInterval());
     EXPECT_FLOAT_EQ(10.0, timer.nextFireInterval());
 
     advanceTimeBy(2.0);
     timer.augmentRepeatInterval(10);
 
     EXPECT_FLOAT_EQ(20.0, timer.repeatInterval());
     EXPECT_FLOAT_EQ(18.0, timer.nextFireInterval());
 
     runUntilIdleOrDeadlinePassed(m_startTime + 50.0);
     EXPECT_THAT(m_runTimes, ElementsAre(m_startTime + 20.0, m_startTime + 40.0));
 }
 
-class MockTimerWithAlignment : public TimerBase {
-public:
-    MockTimerWithAlignment() : m_lastFireTime(0.0), m_alignedFireTime(0.0) { }
-
-    void fired() override
-    {
-    }
-
-    double alignedFireTime(double fireTime) const override
-    {
-        m_lastFireTime = fireTime;
-        return m_alignedFireTime;
-    }
-
-    void setAlignedFireTime(double alignedFireTime)
-    {
-        m_alignedFireTime = alignedFireTime;
-    }
-
-    double lastFireTime() const
-    {
-        return m_lastFireTime;
-    }
-
-private:
-    mutable double m_lastFireTime;
-    double m_alignedFireTime;
-};
-
-TEST_F(TimerTest, TimerAlignment_OneShotZero)
-{
-    MockTimerWithAlignment timer;
-    timer.setAlignedFireTime(m_startTime + 1.0);
-
-    timer.start(0.0, 0.0, BLINK_FROM_HERE);
-
-    // The nextFireInterval gets overrriden.
-    EXPECT_FLOAT_EQ(1.0, timer.nextFireInterval());
-    EXPECT_FLOAT_EQ(0.0, timer.nextUnalignedFireInterval());
-    EXPECT_FLOAT_EQ(m_startTime, timer.lastFireTime());
-}
-
-TEST_F(TimerTest, TimerAlignment_OneShotNonZero)
-{
-    MockTimerWithAlignment timer;
-    timer.setAlignedFireTime(m_startTime + 1.0);
-
-    timer.start(0.5, 0.0, BLINK_FROM_HERE);
-
-    // The nextFireInterval gets overrriden.
-    EXPECT_FLOAT_EQ(1.0, timer.nextFireInterval());
-    EXPECT_FLOAT_EQ(0.5, timer.nextUnalignedFireInterval());
-    EXPECT_FLOAT_EQ(m_startTime + 0.5, timer.lastFireTime());
-}
-
-TEST_F(TimerTest, DidChangeAlignmentInterval)
-{
-    MockTimerWithAlignment timer;
-    timer.setAlignedFireTime(m_startTime + 1.0);
-
-    timer.start(0.0, 0.0, BLINK_FROM_HERE);
-
-    EXPECT_FLOAT_EQ(1.0, timer.nextFireInterval());
-    EXPECT_FLOAT_EQ(0.0, timer.nextUnalignedFireInterval());
-    EXPECT_FLOAT_EQ(m_startTime, timer.lastFireTime());
-
-    timer.setAlignedFireTime(m_startTime);
-    timer.didChangeAlignmentInterval(monotonicallyIncreasingTime());
-
-    EXPECT_FLOAT_EQ(0.0, timer.nextFireInterval());
-    EXPECT_FLOAT_EQ(0.0, timer.nextUnalignedFireInterval());
-    EXPECT_FLOAT_EQ(m_startTime, timer.lastFireTime());
-}
-
 TEST_F(TimerTest, RepeatingTimerDoesNotDrift)
 {
     Timer<TimerTest> timer(this, &TimerTest::recordNextFireTimeTask);
     timer.startRepeating(2.0, BLINK_FROM_HERE);
 
     ASSERT(hasOneTimerTask());
     recordNextFireTimeTask(&timer); // Next scheduled task to run at m_startTime + 2.0
 
     // Simulate timer firing early. Next scheduled task to run at m_startTime + 4.0
     advanceTimeBy(1.9);
@@ skipping 24 matching lines @@
         m_startTime + 6.0,
         m_startTime + 8.0,
         m_startTime + 10.0,
         m_startTime + 14.0,
         m_startTime + 18.0,
         m_startTime + 28.0));
 }
 
 } // namespace
 } // namespace blink