cc: Move WebCompositorOutputSurface and related classes into cc/

webkit/compositor_bindings/web_layer_tree_view_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "web_layer_tree_view_impl.h"
 
 #include "base/command_line.h"
 #include "cc/font_atlas.h"
 #include "cc/input_handler.h"
 #include "cc/layer.h"
@@ skipping 218 matching lines @@
 void WebLayerTreeViewImpl::layout()
 {
     m_client->layout();
 }
 
 void WebLayerTreeViewImpl::applyScrollAndScale(gfx::Vector2d scrollDelta, float pageScale)
 {
     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)
 {
     m_client->didRecreateOutputSurface(success);
 }
 
 scoped_ptr<InputHandler> WebLayerTreeViewImpl::createInputHandler()
 {
     scoped_ptr<InputHandler> ret;
@@ skipping 22 matching lines @@
 {
     m_client->didCompleteSwapBuffers();
 }
 
 void WebLayerTreeViewImpl::scheduleComposite()
 {
     m_client->scheduleComposite();
 }
 
 } // namespace WebKit