cc: Move WebCompositorOutputSurface and related classes into cc/

content/browser/renderer_host/compositor_impl_android.cc

 // 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.
 
 #include "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "cc/font_atlas.h"
 #include "cc/input_handler.h"
 #include "cc/layer.h"
 #include "cc/layer_tree_host.h"
+#include "cc/output_surface.h"
 #include "cc/thread_impl.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/renderer_host/image_transport_factory_android.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorOutputSurface.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "webkit/glue/webthread_impl.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 
 namespace gfx {
 class JavaBitmap;
 }
 
 namespace {
 
 static bool g_initialized = false;
 static webkit_glue::WebThreadImpl* g_impl_thread = NULL;
 static bool g_use_direct_gl = false;
 
-// Adapts a pure WebGraphicsContext3D into a WebCompositorOutputSurface.
-class WebGraphicsContextToOutputSurfaceAdapter :
-    public WebKit::WebCompositorOutputSurface {
-public:
-    explicit WebGraphicsContextToOutputSurfaceAdapter(
-        WebKit::WebGraphicsContext3D* context)
-        : m_context3D(context)
-        , m_client(0)
-    {
-    }
+// Adapts a pure WebGraphicsContext3D into a cc::OutputSurface.
+class WebGraphicsContextToOutputSurfaceAdapter : public cc::OutputSurface {
+ public:
+  explicit WebGraphicsContextToOutputSurfaceAdapter(
+      WebKit::WebGraphicsContext3D* context)
+      : context3d_(context),
+        client_(0) {
+  }
 
-    virtual bool bindToClient(
-        WebKit::WebCompositorOutputSurfaceClient* client) OVERRIDE
-    {
-        DCHECK(client);
-        if (!m_context3D->makeContextCurrent())
-            return false;
-        m_client = client;
-        return true;
-    }
+  virtual bool BindToClient(cc::OutputSurfaceClient* client) OVERRIDE {
+    DCHECK(client);
+    if (!context3d_->makeContextCurrent())
+      return false;
+    client_ = client;
+    return true;
+  }
 
-    virtual const Capabilities& capabilities() const OVERRIDE
-    {
-        return m_capabilities;
-    }
+  virtual const Capabilities& Capabilities() const OVERRIDE {
+    return capabilities_;
+  }
 
-    virtual WebKit::WebGraphicsContext3D* context3D() const OVERRIDE
-    {
-        return m_context3D.get();
-    }
+  virtual WebKit::WebGraphicsContext3D* Context3D() const OVERRIDE {
+    return context3d_.get();
+  }
 
-    virtual void sendFrameToParentCompositor(
-        const WebKit::WebCompositorFrame&) OVERRIDE
-    {
-    }
+  virtual cc::SoftwareOutputDevice* SoftwareDevice() const OVERRIDE {
+    return NULL;
+  }
 
-private:
-    scoped_ptr<WebKit::WebGraphicsContext3D> m_context3D;
-    Capabilities m_capabilities;
-    WebKit::WebCompositorOutputSurfaceClient* m_client;
+  virtual void SendFrameToParentCompositor(
+      const cc::CompositorFrame&) OVERRIDE {
+  }
+
+ private:
+  scoped_ptr<WebKit::WebGraphicsContext3D> context3d_;
+  struct Capabilities capabilities_;
+  cc::OutputSurfaceClient* client_;
 };
 
 } // anonymous namespace
 
 namespace content {
 
 // static
 Compositor* Compositor::Create(Client* client) {
   return client ? new CompositorImpl(client) : NULL;
 }
@@ skipping 176 matching lines @@
 void CompositorImpl::animate(double monotonicFrameBeginTime) {
 }
 
 void CompositorImpl::layout() {
 }
 
 void CompositorImpl::applyScrollAndScale(gfx::Vector2d scrollDelta,
                                          float pageScale) {
 }
 
-scoped_ptr<WebKit::WebCompositorOutputSurface>
-    CompositorImpl::createOutputSurface() {
+scoped_ptr<cc::OutputSurface> CompositorImpl::createOutputSurface() {
   if (g_use_direct_gl) {
     WebKit::WebGraphicsContext3D::Attributes attrs;
     attrs.shareResources = false;
     attrs.noAutomaticFlushes = true;
     scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessImpl> context(
         webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWindow(
             attrs,
             window_,
             NULL));
-    return scoped_ptr<WebKit::WebCompositorOutputSurface>(
+    return scoped_ptr<cc::OutputSurface>(
         new WebGraphicsContextToOutputSurfaceAdapter(context.release()));
   } else {
     DCHECK(window_ && surface_id_);
     WebKit::WebGraphicsContext3D::Attributes attrs;
     attrs.shareResources = true;
     attrs.noAutomaticFlushes = true;
     GpuChannelHostFactory* factory = BrowserGpuChannelHostFactory::instance();
     GURL url("chrome://gpu/Compositor::createContext3D");
     scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context(
         new WebGraphicsContext3DCommandBufferImpl(surface_id_,
                                                   url,
                                                   factory,
                                                   weak_factory_.GetWeakPtr()));
     if (!context->Initialize(
         attrs,
         false,
         CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE)) {
       LOG(ERROR) << "Failed to create 3D context for compositor.";
-      return scoped_ptr<WebKit::WebCompositorOutputSurface>();
+      return scoped_ptr<cc::OutputSurface>();
     }
-    return scoped_ptr<WebKit::WebCompositorOutputSurface>(
+    return scoped_ptr<cc::OutputSurface>(
         new WebGraphicsContextToOutputSurfaceAdapter(context.release()));
   }
 }
 
 scoped_ptr<cc::InputHandler> CompositorImpl::createInputHandler() {
   return scoped_ptr<cc::InputHandler>();
 }
 
 void CompositorImpl::didRecreateOutputSurface(bool success) {
 }
@@ skipping 75 matching lines @@
     case ANDROID_BITMAP_FORMAT_RGBA_8888:
       return GL_UNSIGNED_BYTE;
       break;
     case ANDROID_BITMAP_FORMAT_RGB_565:
     default:
       return GL_UNSIGNED_SHORT_5_6_5;
   }
 }
 
 } // namespace content