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

Unified Diff: webkit/compositor_bindings/WebCompositorImpl.cpp

Issue 10913158: Avoid using WTF threading code in cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | « webkit/compositor_bindings/CCThreadImpl.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/compositor_bindings/WebCompositorImpl.cpp
diff --git a/webkit/compositor_bindings/WebCompositorImpl.cpp b/webkit/compositor_bindings/WebCompositorImpl.cpp
index 8fd9f45925e615ca2c6fa73f4c03ec7e7e69e8f8..5086837a2e97a9d1cf5a5fb628fded043ac8a854 100644
--- a/webkit/compositor_bindings/WebCompositorImpl.cpp
+++ b/webkit/compositor_bindings/WebCompositorImpl.cpp
@@ -13,6 +13,14 @@
#include <public/Platform.h>
#include <wtf/ThreadingPrimitives.h>
+#if defined(USE_LIBCC_FOR_COMPOSITOR)
+#ifdef LOG
+#undef LOG
+#endif
+#include "base/message_loop_proxy.h"
+#include "webkit/glue/webthread_impl.h"
+#endif
+
using namespace WebCore;
namespace WebKit {
@@ -60,10 +68,10 @@ void WebCompositorImpl::initialize(WebThread* implThread)
ASSERT(!s_initialized);
s_initialized = true;
- s_mainThread = CCThreadImpl::create(WebKit::Platform::current()->currentThread()).leakPtr();
+ s_mainThread = CCThreadImpl::createForCurrentThread().leakPtr();
CCProxy::setMainThread(s_mainThread);
if (implThread) {
- s_implThread = CCThreadImpl::create(implThread).leakPtr();
+ s_implThread = CCThreadImpl::createForDifferentThread(implThread).leakPtr();
CCProxy::setImplThread(s_implThread);
} else
CCProxy::setImplThread(0);
« no previous file with comments | « webkit/compositor_bindings/CCThreadImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698