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

Unified Diff: webkit/compositor_bindings/web_compositor_support_impl.cc

Issue 12211110: Implement WebKit::WebUnitTestSupport::createLayerTreeViewForTesting() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add enum, fix NON_EXPORTED_BASE Created 7 years, 10 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
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

Powered by Google App Engine
This is Rietveld 408576698