cc: Move WebCompositorOutputSurface and related classes into cc/

content/browser/renderer_host/compositor_impl_android.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 47 matching lines @@
   virtual void CopyTextureToBitmap(WebKit::WebGLId texture_id,
                                    gfx::JavaBitmap& bitmap) OVERRIDE;
 
   // LayerTreeHostClient implementation.
   virtual void willBeginFrame() OVERRIDE {}
   virtual void didBeginFrame() OVERRIDE {}
   virtual void animate(double monotonicFrameBeginTime) OVERRIDE;
   virtual void layout() OVERRIDE;
   virtual void applyScrollAndScale(gfx::Vector2d scrollDelta,
                                    float pageScale) OVERRIDE;
-  virtual scoped_ptr<WebKit::WebCompositorOutputSurface> createOutputSurface()
-      OVERRIDE;
+  virtual scoped_ptr<cc::OutputSurface> createOutputSurface() OVERRIDE;
   virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE;
   virtual void didRecreateOutputSurface(bool success) OVERRIDE;
   virtual void willCommit() OVERRIDE {}
   virtual void didCommit() OVERRIDE;
   virtual void didCommitAndDrawFrame() OVERRIDE;
   virtual void didCompleteSwapBuffers() OVERRIDE;
   virtual void scheduleComposite() OVERRIDE;
   virtual scoped_ptr<cc::FontAtlas> createFontAtlas() OVERRIDE;
 
   // WebGraphicsContext3DSwapBuffersClient implementation.
@@ skipping 16 matching lines @@
 
   Compositor::Client* client_;
   base::WeakPtrFactory<CompositorImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_