cc: Move WebCompositorOutputSurface and related classes into cc/

content/browser/renderer_host/image_transport_factory.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/image_transport_factory.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
+#include "cc/output_surface.h"
+#include "cc/output_surface_client.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_surface_tracker.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_messages.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/common/webkitplatformsupport_impl.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/ipc/command_buffer_proxy.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorOutputSurface.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorOutputSurfaceClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_setup.h"
 #include "ui/compositor/test_web_graphics_context_3d.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 
 #if defined(OS_WIN)
 #include "ui/surface/accelerated_surface_win.h"
 #endif
@@ skipping 224 matching lines @@
       base::RefCountedThreadSafe<BrowserCompositorOutputSurfaceProxy>;
   ~BrowserCompositorOutputSurfaceProxy() {}
   IDMap<BrowserCompositorOutputSurface> surface_map_;
   bool message_handler_set_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserCompositorOutputSurfaceProxy);
 };
 
 
 // Adapts a WebGraphicsContext3DCommandBufferImpl into a
-// WebCompositorOutputSurface that also handles vsync parameter updates
+// cc::OutputSurface that also handles vsync parameter updates
 // arriving from the GPU process.
 class BrowserCompositorOutputSurface :
-    public WebKit::WebCompositorOutputSurface,
+    public cc::OutputSurface,
     public base::NonThreadSafe {
  public:
   explicit BrowserCompositorOutputSurface(
       WebGraphicsContext3DCommandBufferImpl* context,
       int surface_id,
       BrowserCompositorOutputSurfaceProxy* output_surface_proxy)
       : context3D_(context),
         surface_id_(surface_id),
         client_(NULL),
         output_surface_proxy_(output_surface_proxy) {
     DetachFromThread();
   }
 
   virtual ~BrowserCompositorOutputSurface() {
     DCHECK(CalledOnValidThread());
     if (!client_)
       return;
     output_surface_proxy_->RemoveSurface(surface_id_);
   }
 
-  virtual bool bindToClient(
-      WebKit::WebCompositorOutputSurfaceClient* client) OVERRIDE {
+  virtual bool BindToClient(
+      cc::OutputSurfaceClient* client) OVERRIDE {
     DCHECK(CalledOnValidThread());
     DCHECK(client);
     DCHECK(!client_);
     if (context3D_.get()) {
       if (!context3D_->makeContextCurrent())
         return false;
     }
 
     client_ = client;
     output_surface_proxy_->AddSurface(this, surface_id_);
     return true;
   }
 
-  virtual const Capabilities& capabilities() const OVERRIDE {
+  virtual const struct Capabilities& Capabilities() const OVERRIDE {
     DCHECK(CalledOnValidThread());
     return capabilities_;
   }
 
-  virtual WebKit::WebGraphicsContext3D* context3D() const OVERRIDE {
+  virtual WebKit::WebGraphicsContext3D* Context3D() const OVERRIDE {
     DCHECK(CalledOnValidThread());
     return context3D_.get();
   }
 
-  virtual void sendFrameToParentCompositor(
-      const WebKit::WebCompositorFrame&) OVERRIDE {
+  virtual cc::SoftwareOutputDevice* SoftwareDevice() const OVERRIDE {
+    DCHECK(CalledOnValidThread());
+    return NULL;
+  }
+
+  virtual void SendFrameToParentCompositor(
+      const cc::CompositorFrame&) OVERRIDE {
   }
 
   void OnUpdateVSyncParameters(
       base::TimeTicks timebase, base::TimeDelta interval) {
     DCHECK(CalledOnValidThread());
     DCHECK(client_);
     double monotonicTimebase = timebase.ToInternalValue() /
       static_cast<double>(base::Time::kMicrosecondsPerSecond);
     double intervalInSeconds = interval.ToInternalValue() /
       static_cast<double>(base::Time::kMicrosecondsPerSecond);
-    client_->onVSyncParametersChanged(monotonicTimebase, intervalInSeconds);
+    client_->OnVSyncParametersChanged(monotonicTimebase, intervalInSeconds);

[jamesr, 2012/12/04 07:06:51]

you can rid of of all this ugly math when you make OnVSync... take base::Time*
parameters

   }
 
  private:
   scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context3D_;
   int surface_id_;
-  Capabilities capabilities_;
-  WebKit::WebCompositorOutputSurfaceClient* client_;
+  struct Capabilities capabilities_;

[jamesr, 2012/12/04 07:06:51]

don't need the "struct" here

[danakj, 2012/12/04 18:15:34]

The compiler makes me use struct everywhere :/ I have no idea why though. Maybe
you will..

+  cc::OutputSurfaceClient* client_;
   scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_;
 };
 
 void BrowserCompositorOutputSurfaceProxy::OnUpdateVSyncParameters(
     int surface_id, base::TimeTicks timebase, base::TimeDelta interval) {
   BrowserCompositorOutputSurface* surface = surface_map_.Lookup(surface_id);
   if (surface)
     surface->OnUpdateVSyncParameters(timebase, interval);
 }
 
@@ skipping 10 matching lines @@
   virtual ~GpuProcessTransportFactory() {
     DCHECK(per_compositor_data_.empty());
   }
 
   virtual WebGraphicsContext3DCommandBufferImpl* CreateOffscreenContext()
       OVERRIDE {
     base::WeakPtr<WebGraphicsContext3DSwapBuffersClient> swap_client;
     return CreateContextCommon(swap_client, 0);
   }
 
-  virtual WebKit::WebCompositorOutputSurface* CreateOutputSurface(
+  virtual cc::OutputSurface* CreateOutputSurface(
       ui::Compositor* compositor) OVERRIDE {
     PerCompositorData* data = per_compositor_data_[compositor];
     if (!data)
       data = CreatePerCompositorData(compositor);
     WebGraphicsContext3DCommandBufferImpl* context =
         CreateContextCommon(data->swap_client->AsWeakPtr(),
                             data->surface_id);
     return new BrowserCompositorOutputSurface(
         context,
         per_compositor_data_[compositor]->surface_id,
@@ skipping 257 matching lines @@
   delete g_factory;
   g_factory = NULL;
 }
 
 // static
 ImageTransportFactory* ImageTransportFactory::GetInstance() {
   return g_factory;
 }
 
 }  // namespace content