| Index: webkit/compositor_bindings/WebCompositorImpl.cpp
|
| diff --git a/webkit/compositor_bindings/WebCompositorImpl.cpp b/webkit/compositor_bindings/WebCompositorImpl.cpp
|
| index 1b7d831347c4f8f5776370762e81b61972c5e3d6..2d39f92a6032f4acc2e5584bd409d71cf36e07f8 100644
|
| --- a/webkit/compositor_bindings/WebCompositorImpl.cpp
|
| +++ b/webkit/compositor_bindings/WebCompositorImpl.cpp
|
| @@ -6,20 +6,16 @@
|
|
|
| #include "WebCompositorImpl.h"
|
|
|
| -#include "CCLayerTreeHost.h"
|
| -#include "CCProxy.h"
|
| -#include "CCSettings.h"
|
| #include "CCThreadImpl.h"
|
| -#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 "cc/layer_tree_host.h"
|
| +#include "cc/proxy.h"
|
| +#include "cc/settings.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
|
| #include "webkit/glue/webthread_impl.h"
|
| -#endif
|
|
|
| using namespace cc;
|
|
|
| @@ -74,10 +70,10 @@ void WebCompositorImpl::initialize(WebThread* implThread)
|
| ASSERT(!s_initialized);
|
| s_initialized = true;
|
|
|
| - s_mainThread = CCThreadImpl::createForCurrentThread().leakPtr();
|
| + s_mainThread = CCThreadImpl::createForCurrentThread().release();
|
| CCProxy::setMainThread(s_mainThread);
|
| if (implThread) {
|
| - s_implThread = CCThreadImpl::createForDifferentThread(implThread).leakPtr();
|
| + s_implThread = CCThreadImpl::createForDifferentThread(implThread).release();
|
| CCProxy::setImplThread(s_implThread);
|
| } else
|
| CCProxy::setImplThread(0);
|
|
|