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); |