cc: Move WebCompositorOutputSurface and related classes into cc/

This moves:
- WebKit::WebCompositorOutputSurface to cc::OutputSurface
- WebKit::WebCompositorOutputSurfaceClient to cc::OutputSurfaceClient
- Webkit::WebCompositorSoftwareOutputDevice to cc::SoftwareOutputDevice

They become new files in cc/ so they are chromified style. This affects
the various call-sites. This allows us to pass cc::CompositorFrame
directly, without any need for WebCompositorFrame.

BUG=146080
Depends on: https://bugs.webkit.org/show_bug.cgi?id=103967

Review URL: https://codereview.chromium.org/11348371

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171847 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 6 deletions

diff --git a/cc/test/pixel_test_output_surface.cc b/cc/test/pixel_test_output_surface.cc
index 46985b7..a7e1542 100644
--- a/cc/test/pixel_test_output_surface.cc
+++ b/cc/test/pixel_test_output_surface.cc
@@ -18,19 +18,22 @@ PixelTestOutputSurface::PixelTestOutputSurface() {
 PixelTestOutputSurface::~PixelTestOutputSurface() {
 }
 
-bool PixelTestOutputSurface::bindToClient(
-    WebKit::WebCompositorOutputSurfaceClient*) {
+bool PixelTestOutputSurface::BindToClient(OutputSurfaceClient*) {
   return context_->makeContextCurrent();
 }
 
-const WebKit::WebCompositorOutputSurface::Capabilities&
-    PixelTestOutputSurface::capabilities() const {
-  static WebKit::WebCompositorOutputSurface::Capabilities capabilities;
+const struct OutputSurface::Capabilities& PixelTestOutputSurface::Capabilities()
+    const {
+  static struct OutputSurface::Capabilities capabilities;
   return capabilities;
 }
 
-WebKit::WebGraphicsContext3D* PixelTestOutputSurface::context3D() const {
+WebKit::WebGraphicsContext3D* PixelTestOutputSurface::Context3D() const {
   return context_.get();
 }
 
+SoftwareOutputDevice* PixelTestOutputSurface::SoftwareDevice() const {
+  return NULL;
+}
+
 }  // namespace cc