diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 23:18:17 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 23:18:17 +0000 |
commit | 16f1477629252f905088b90b88edbaf9bd53f676 (patch) | |
tree | cd3021d47b3a961586090a8b5d20d33f13bac83e /cc/test/run_all_unittests.cc | |
parent | dfca4c3357d346e496a847b7657e96ab97e0c4a4 (diff) | |
download | chromium_src-16f1477629252f905088b90b88edbaf9bd53f676.zip chromium_src-16f1477629252f905088b90b88edbaf9bd53f676.tar.gz chromium_src-16f1477629252f905088b90b88edbaf9bd53f676.tar.bz2 |
Revert 165050 - 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
Review URL: https://codereview.chromium.org/11344004
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/11347050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/run_all_unittests.cc')
-rw-r--r-- | cc/test/run_all_unittests.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cc/test/run_all_unittests.cc b/cc/test/run_all_unittests.cc index d0fddbc..9132bab 100644 --- a/cc/test/run_all_unittests.cc +++ b/cc/test/run_all_unittests.cc @@ -4,17 +4,18 @@ #include "base/message_loop.h" #include "base/test/test_suite.h" -#include "cc/thread_impl.h" -#include "cc/proxy.h" +#include "cc/test/test_webkit_platform.h" #include "testing/gmock/include/gmock/gmock.h" +#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" int main(int argc, char** argv) { ::testing::InitGoogleMock(&argc, argv); TestSuite test_suite(argc, argv); + cc::TestWebKitPlatform platform; MessageLoop message_loop; - scoped_ptr<cc::Thread> mainCCThread = cc::ThreadImpl::createForCurrentThread(); - cc::Proxy::setMainThread(mainCCThread.get()); + WebKit::Platform::initialize(&platform); int result = test_suite.Run(); + WebKit::Platform::shutdown(); return result; } |