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

Unified Diff: webkit/compositor_bindings/web_compositor_impl.cc

Issue 11344004: Remove WebKit::Platform dependencies from cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix webkit_compositor_bindings_unittests 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
Index: webkit/compositor_bindings/web_compositor_impl.cc
diff --git a/webkit/compositor_bindings/web_compositor_impl.cc b/webkit/compositor_bindings/web_compositor_impl.cc
index 5d0a2e94319b87b4fbf9b348bc5158aaff9e3f17..dcf5ec36c3d2d8907abb1dbcc226b4dfcaac3223 100644
--- a/webkit/compositor_bindings/web_compositor_impl.cc
+++ b/webkit/compositor_bindings/web_compositor_impl.cc
@@ -13,7 +13,7 @@
#include "cc/layer_tree_host.h"
#include "cc/proxy.h"
#include "cc/settings.h"
-#include "ccthread_impl.h"
+#include "cc/thread_impl.h"
#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
#include "webkit/glue/webthread_impl.h"
@@ -45,10 +45,12 @@ void WebCompositorImpl::initialize(WebThread* implThread)
ASSERT(!s_initialized);
s_initialized = true;
- s_mainThread = CCThreadImpl::createForCurrentThread().release();
+ s_mainThread = cc::ThreadImpl::createForCurrentThread().release();
Proxy::setMainThread(s_mainThread);
if (implThread) {
- s_implThread = CCThreadImpl::createForDifferentThread(implThread).release();
+ webkit_glue::WebThreadImpl* webThreadImpl = static_cast<webkit_glue::WebThreadImpl*>(implThread);
+ MessageLoop* implMessageLoop = webThreadImpl->message_loop();
+ s_implThread = cc::ThreadImpl::createForDifferentThread(implMessageLoop->message_loop_proxy()).release();
Proxy::setImplThread(s_implThread);
} else
Proxy::setImplThread(0);
« no previous file with comments | « webkit/compositor_bindings/test/run_all_unittests.cc ('k') | webkit/compositor_bindings/web_layer_tree_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698