cc: Move WebCompositorOutputSurface and related classes into cc/

webkit/compositor_bindings/web_layer_tree_view_impl.cc

Index: webkit/compositor_bindings/web_layer_tree_view_impl.cc
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
index 15041165865be3bf04c01500ac941fa2c86d6c33..29fd0836d825493769c1d1bb9290a957d9f22740 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
@@ -236,9 +236,10 @@ void WebLayerTreeViewImpl::applyScrollAndScale(gfx::Vector2d scrollDelta, float
     m_client->applyScrollAndScale(scrollDelta, pageScale);
 }
 
-scoped_ptr<WebCompositorOutputSurface> WebLayerTreeViewImpl::createOutputSurface()
+scoped_ptr<cc::OutputSurface> WebLayerTreeViewImpl::createOutputSurface()
 {
-    return scoped_ptr<WebCompositorOutputSurface>(m_client->createOutputSurface());
+    WebKit::WebCompositorOutputSurface *web = m_client->createOutputSurface();

[jamesr, 2012/12/07 17:36:24]

i think the * should go with the type

[danakj, 2012/12/07 17:43:13]

Done.

+    return make_scoped_ptr(static_cast<cc::OutputSurface*>(web));

[jamesr, 2012/12/07 17:36:24]

can you avoid the static cast?  perhaps

scoped_ptr<cc::OutputSurface>(web).Pass()

[danakj, 2012/12/07 17:43:13]

No :( That doesn't compile, nor does:

make_scoped_ptr(web).PassAs<cc::OutputSurface>()

 }
 
 void WebLayerTreeViewImpl::didRecreateOutputSurface(bool success)