| Index: cc/test/CCSchedulerTestCommon.h
|
| diff --git a/cc/test/CCSchedulerTestCommon.h b/cc/test/CCSchedulerTestCommon.h
|
| index 673fd7d70fd6d24e0aa0d027f426b3d1c9c0fd41..9a54b21e4329089f17b6e43feae8e9e1024cc606 100644
|
| --- a/cc/test/CCSchedulerTestCommon.h
|
| +++ b/cc/test/CCSchedulerTestCommon.h
|
| @@ -20,7 +20,7 @@ public:
|
| void reset() { m_tickCalled = false; }
|
| bool tickCalled() const { return m_tickCalled; }
|
|
|
| - virtual void onTimerTick() OVERRIDE { m_tickCalled = true; }
|
| + virtual void onTimerTick() OVERRIDE;
|
|
|
| protected:
|
| bool m_tickCalled;
|
| @@ -28,7 +28,9 @@ protected:
|
|
|
| class FakeCCThread : public cc::CCThread {
|
| public:
|
| - FakeCCThread() { reset(); }
|
| + FakeCCThread();
|
| + virtual ~FakeCCThread();
|
| +
|
| void reset()
|
| {
|
| m_pendingTaskDelay = 0;
|
| @@ -55,17 +57,9 @@ public:
|
| return m_pendingTaskDelay;
|
| }
|
|
|
| - virtual void postTask(PassOwnPtr<Task>) { ASSERT_NOT_REACHED(); }
|
| - virtual void postDelayedTask(PassOwnPtr<Task> task, long long delay)
|
| - {
|
| - if (m_runPendingTaskOnOverwrite && hasPendingTask())
|
| - runPendingTask();
|
| -
|
| - EXPECT_TRUE(!hasPendingTask());
|
| - m_pendingTask = task;
|
| - m_pendingTaskDelay = delay;
|
| - }
|
| - virtual base::PlatformThreadId threadID() const { return 0; }
|
| + virtual void postTask(PassOwnPtr<Task>) OVERRIDE;
|
| + virtual void postDelayedTask(PassOwnPtr<Task> task, long long delay) OVERRIDE;
|
| + virtual base::PlatformThreadId threadID() const OVERRIDE;
|
|
|
| protected:
|
| OwnPtr<Task> m_pendingTask;
|
| @@ -85,12 +79,12 @@ public:
|
|
|
| virtual ~FakeCCTimeSource() { }
|
|
|
| - virtual void setClient(cc::CCTimeSourceClient* client) OVERRIDE { m_client = client; }
|
| - virtual void setActive(bool b) OVERRIDE { m_active = b; }
|
| - virtual bool active() const OVERRIDE { return m_active; }
|
| + virtual void setClient(cc::CCTimeSourceClient* client) OVERRIDE;
|
| + virtual void setActive(bool b) OVERRIDE;
|
| + virtual bool active() const OVERRIDE;
|
| virtual void setTimebaseAndInterval(double timebase, double interval) OVERRIDE { }
|
| - virtual double lastTickTime() OVERRIDE { return 0; }
|
| - virtual double nextTickTimeIfActivated() OVERRIDE { return 0; }
|
| + virtual double lastTickTime() OVERRIDE;
|
| + virtual double nextTickTimeIfActivated() OVERRIDE;
|
|
|
| void tick()
|
| {
|
| @@ -115,7 +109,7 @@ public:
|
| }
|
|
|
| void setMonotonicTimeNow(double time) { m_monotonicTimeNow = time; }
|
| - virtual double monotonicTimeNow() const OVERRIDE { return m_monotonicTimeNow; }
|
| + virtual double monotonicTimeNow() const OVERRIDE;
|
|
|
| protected:
|
| FakeCCDelayBasedTimeSource(double interval, cc::CCThread* thread)
|
|
|