| Index: webkit/compositor_bindings/web_compositor_support_impl.cc
|
| diff --git a/webkit/compositor_bindings/web_compositor_support_impl.cc b/webkit/compositor_bindings/web_compositor_support_impl.cc
|
| index 32a18408180f2ff163223c1aac85fcc6eec1549f..2b5c88a1d4a1ab7346ed835741e8d0cbc0154271 100644
|
| --- a/webkit/compositor_bindings/web_compositor_support_impl.cc
|
| +++ b/webkit/compositor_bindings/web_compositor_support_impl.cc
|
| @@ -55,8 +55,12 @@ WebCompositorSupportImpl::WebCompositorSupportImpl() {
|
| WebCompositorSupportImpl::~WebCompositorSupportImpl() {
|
| }
|
|
|
| -void WebCompositorSupportImpl::initialize(WebKit::WebThread* thread) {
|
| - WebCompositorImpl::initialize(thread);
|
| +void WebCompositorSupportImpl::initialize(WebKit::WebThread* implThread) {
|
| + ASSERT(!state_.mainThread);
|
| + state_.mainThread = CCThreadImpl::createForCurrentThread().release();
|
| + if (implThread)
|
| + state_.implThread = CCThreadImpl::createForDifferentThread(implThread)
|
| + .release();
|
| }
|
|
|
| bool WebCompositorSupportImpl::isThreadingEnabled() {
|
| @@ -88,7 +92,7 @@ WebLayerTreeView* WebCompositorSupportImpl::createLayerTreeView(
|
| const WebLayerTreeView::Settings& settings) {
|
| scoped_ptr<WebKit::WebLayerTreeViewImpl> layerTreeViewImpl(
|
| new WebKit::WebLayerTreeViewImpl(client));
|
| - if (!layerTreeViewImpl->initialize(settings))
|
| + if (!layerTreeViewImpl->initialize(settings, &state_))
|
| return NULL;
|
| layerTreeViewImpl->setRootLayer(root);
|
| return layerTreeViewImpl.release();
|
|
|