Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Unified Diff: cc/test/CCSchedulerTestCommon.h

Issue 11108020: [cc] Change cc_tests.gyp filenames to Chromium style (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/CCRenderPassTestCommon.h ('k') | cc/test/CCSchedulerTestCommon.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/CCSchedulerTestCommon.h
diff --git a/cc/test/CCSchedulerTestCommon.h b/cc/test/CCSchedulerTestCommon.h
index 2f6660bd7f3ba5478e4193b40669139924349ffa..abfb555372a5e51d352650b4578559036d9962f5 100644
--- a/cc/test/CCSchedulerTestCommon.h
+++ b/cc/test/CCSchedulerTestCommon.h
@@ -1,131 +1,6 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
+// Copyright 2012 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.
-#ifndef CCSchedulerTestCommon_h
-#define CCSchedulerTestCommon_h
-
-#include "CCDelayBasedTimeSource.h"
-#include "CCFrameRateController.h"
-#include "CCThread.h"
-#include "base/threading/platform_thread.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include <wtf/OwnPtr.h>
-
-namespace WebKitTests {
-
-class FakeCCTimeSourceClient : public cc::CCTimeSourceClient {
-public:
- FakeCCTimeSourceClient() { reset(); }
- void reset() { m_tickCalled = false; }
- bool tickCalled() const { return m_tickCalled; }
-
- virtual void onTimerTick() OVERRIDE;
-
-protected:
- bool m_tickCalled;
-};
-
-class FakeCCThread : public cc::CCThread {
-public:
- FakeCCThread();
- virtual ~FakeCCThread();
-
- void reset()
- {
- m_pendingTaskDelay = 0;
- m_pendingTask.clear();
- m_runPendingTaskOnOverwrite = false;
- }
-
- void runPendingTaskOnOverwrite(bool enable)
- {
- m_runPendingTaskOnOverwrite = enable;
- }
-
- bool hasPendingTask() const { return m_pendingTask; }
- void runPendingTask()
- {
- ASSERT(m_pendingTask);
- OwnPtr<Task> task = m_pendingTask.release();
- task->performTask();
- }
-
- long long pendingDelayMs() const
- {
- EXPECT_TRUE(hasPendingTask());
- return m_pendingTaskDelay;
- }
-
- 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;
- long long m_pendingTaskDelay;
- bool m_runPendingTaskOnOverwrite;
-};
-
-class FakeCCTimeSource : public cc::CCTimeSource {
-public:
- FakeCCTimeSource()
- : m_active(false)
- , m_client(0)
- {
- turnOffVerifier();
- }
-
- virtual ~FakeCCTimeSource() { }
-
- virtual void setClient(cc::CCTimeSourceClient* client) OVERRIDE;
- virtual void setActive(bool b) OVERRIDE;
- virtual bool active() const OVERRIDE;
- virtual void setTimebaseAndInterval(base::TimeTicks timebase, base::TimeDelta interval) OVERRIDE { }
- virtual base::TimeTicks lastTickTime() OVERRIDE;
- virtual base::TimeTicks nextTickTime() OVERRIDE;
-
- void tick()
- {
- ASSERT(m_active);
- if (m_client)
- m_client->onTimerTick();
- }
-
- void setNextTickTime(base::TimeTicks nextTickTime) { m_nextTickTime = nextTickTime; }
-
-protected:
- bool m_active;
- base::TimeTicks m_nextTickTime;
- cc::CCTimeSourceClient* m_client;
-};
-
-class FakeCCDelayBasedTimeSource : public cc::CCDelayBasedTimeSource {
-public:
- static PassRefPtr<FakeCCDelayBasedTimeSource> create(base::TimeDelta interval, cc::CCThread* thread)
- {
- return adoptRef(new FakeCCDelayBasedTimeSource(interval, thread));
- }
-
- void setNow(base::TimeTicks time) { m_now = time; }
- virtual base::TimeTicks now() const OVERRIDE;
-
-protected:
- FakeCCDelayBasedTimeSource(base::TimeDelta interval, cc::CCThread* thread)
- : CCDelayBasedTimeSource(interval, thread)
- {
- }
-
- base::TimeTicks m_now;
-};
-
-class FakeCCFrameRateController : public cc::CCFrameRateController {
-public:
- FakeCCFrameRateController(PassRefPtr<cc::CCTimeSource> timer) : cc::CCFrameRateController(timer) { }
-
- int numFramesPending() const { return m_numFramesPending; }
-};
-
-}
-
-#endif // CCSchedulerTestCommon_h
+// Temporary forwarding header
+#include "cc/test/scheduler_test_common.h"
« no previous file with comments | « cc/test/CCRenderPassTestCommon.h ('k') | cc/test/CCSchedulerTestCommon.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698