| 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 067f384090e2b34bcf5fff170ae1c1693dbffbee..705f74f19f8ec0c03e15c4cdc68a1b8f54e4fef9 100644
|
| --- a/webkit/compositor_bindings/web_compositor_support_impl.cc
|
| +++ b/webkit/compositor_bindings/web_compositor_support_impl.cc
|
| @@ -80,22 +80,6 @@ void WebCompositorSupportImpl::shutdown() {
|
| impl_thread_message_loop_proxy_ = NULL;
|
| }
|
|
|
| -WebLayerTreeView* WebCompositorSupportImpl::createLayerTreeView(
|
| - WebLayerTreeViewClient* client, const WebLayer& root,
|
| - const WebLayerTreeView::Settings& settings) {
|
| - DCHECK(initialized_);
|
| - scoped_ptr<WebKit::WebLayerTreeViewImpl> layerTreeViewImpl(
|
| - new WebKit::WebLayerTreeViewImpl(client));
|
| - scoped_ptr<cc::Thread> impl_thread;
|
| - if (impl_thread_message_loop_proxy_)
|
| - impl_thread = cc::ThreadImpl::createForDifferentThread(
|
| - impl_thread_message_loop_proxy_);
|
| - if (!layerTreeViewImpl->initialize(settings, impl_thread.Pass()))
|
| - return NULL;
|
| - layerTreeViewImpl->setRootLayer(root);
|
| - return layerTreeViewImpl.release();
|
| -}
|
| -
|
| WebKit::WebCompositorOutputSurface*
|
| WebCompositorSupportImpl::createOutputSurfaceFor3D(
|
| WebKit::WebGraphicsContext3D* context) {
|
| @@ -171,4 +155,20 @@ WebTransformOperations* WebCompositorSupportImpl::createTransformOperations() {
|
| return new WebTransformOperationsImpl();
|
| }
|
|
|
| +WebLayerTreeView* WebCompositorSupportImpl::createLayerTreeView(
|
| + WebLayerTreeViewClient* client, const WebLayer& root,
|
| + const WebLayerTreeView::Settings& settings) {
|
| + DCHECK(initialized_);
|
| + scoped_ptr<WebKit::WebLayerTreeViewImpl> layerTreeViewImpl(
|
| + new WebKit::WebLayerTreeViewImpl(client));
|
| + scoped_ptr<cc::Thread> impl_thread;
|
| + if (impl_thread_message_loop_proxy_)
|
| + impl_thread = cc::ThreadImpl::createForDifferentThread(
|
| + impl_thread_message_loop_proxy_);
|
| + if (!layerTreeViewImpl->initialize(settings, impl_thread.Pass()))
|
| + return NULL;
|
| + layerTreeViewImpl->setRootLayer(root);
|
| + return layerTreeViewImpl.release();
|
| +}
|
| +
|
| } // namespace webkit
|
|
|