From 4a04889139472080d9be371c2c0f618c4da4e7a0 Mon Sep 17 00:00:00 2001 From: "jamesr@chromium.org" Date: Tue, 30 Oct 2012 23:29:50 +0000 Subject: Remove WebKit::Platform dependencies from cc This removes all dependencies on the static WebKit::Platform pointer from cc. The biggest change is implementing cc::Thread on top of base::MessageLoopProxy instead of WebKit::WebThread. For the main thread cc::Thread simply binds to the current thread's MessageLoopProxy. For the impl thread, the bindings layer (specifically webkit/compositor_bindings/web_compositor_impl) extracts the MessageLoopProxy out of the passed in WebThread. BUG=144539 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=165050 Review URL: https://codereview.chromium.org/11344004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165060 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/test/scheduler_test_common.h | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'cc/test/scheduler_test_common.h') diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h index a586150..e43e4b8 100644 --- a/cc/test/scheduler_test_common.h +++ b/cc/test/scheduler_test_common.h @@ -5,12 +5,11 @@ #ifndef CCSchedulerTestCommon_h #define CCSchedulerTestCommon_h -#include "base/threading/platform_thread.h" +#include "base/memory/scoped_ptr.h" #include "cc/delay_based_time_source.h" #include "cc/frame_rate_controller.h" #include "cc/thread.h" #include "testing/gtest/include/gtest/gtest.h" -#include namespace WebKitTests { @@ -34,7 +33,7 @@ public: void reset() { m_pendingTaskDelay = 0; - m_pendingTask.clear(); + m_pendingTask.reset(); m_runPendingTaskOnOverwrite = false; } @@ -44,12 +43,7 @@ public: } bool hasPendingTask() const { return m_pendingTask; } - void runPendingTask() - { - ASSERT_TRUE(m_pendingTask); - OwnPtr task = m_pendingTask.release(); - task->performTask(); - } + void runPendingTask(); long long pendingDelayMs() const { @@ -57,12 +51,12 @@ public: return m_pendingTaskDelay; } - virtual void postTask(PassOwnPtr) OVERRIDE; - virtual void postDelayedTask(PassOwnPtr task, long long delay) OVERRIDE; - virtual base::PlatformThreadId threadID() const OVERRIDE; + virtual void postTask(base::Closure cb) OVERRIDE; + virtual void postDelayedTask(base::Closure cb, long long delay) OVERRIDE; + virtual bool belongsToCurrentThread() const OVERRIDE; protected: - OwnPtr m_pendingTask; + scoped_ptr m_pendingTask; long long m_pendingTaskDelay; bool m_runPendingTaskOnOverwrite; }; -- cgit v1.1