Have a common implementation of cc::OutputSurface

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"
@@ skipping 278 matching lines @@
 // cc::OutputSurface that also handles vsync parameter updates
 // arriving from the GPU process.
 class BrowserCompositorOutputSurface
     : public cc::OutputSurface,
       public base::NonThreadSafe {
  public:
   explicit BrowserCompositorOutputSurface(
       WebGraphicsContext3DCommandBufferImpl* context,
       int surface_id,
       BrowserCompositorOutputSurfaceProxy* output_surface_proxy)
-      : context3D_(context),
+      : OutputSurface(scoped_ptr<WebKit::WebGraphicsContext3D>(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(
       cc::OutputSurfaceClient* client) OVERRIDE {
     DCHECK(CalledOnValidThread());
-    DCHECK(client);
-    DCHECK(!client_);
-    if (context3D_.get()) {
-      if (!context3D_->makeContextCurrent())
-        return false;
-    }
 
-    client_ = client;
+    if (!OutputSurface::BindToClient(client))
+      return false;
+
     output_surface_proxy_->AddSurface(this, surface_id_);
     return true;
   }
 
-  virtual const struct Capabilities& Capabilities() const OVERRIDE {
-    DCHECK(CalledOnValidThread());
-    return capabilities_;
-  }
-
-  virtual WebKit::WebGraphicsContext3D* Context3D() const OVERRIDE {
-    DCHECK(CalledOnValidThread());
-    return context3D_.get();
-  }
-
-  virtual cc::SoftwareOutputDevice* SoftwareDevice() const OVERRIDE {
-    DCHECK(CalledOnValidThread());
-    return NULL;
-  }
-
-  virtual void SendFrameToParentCompositor(
-      cc::CompositorFrame*) OVERRIDE {
-  }
-
   void OnUpdateVSyncParameters(
       base::TimeTicks timebase, base::TimeDelta interval) {
     DCHECK(CalledOnValidThread());
     DCHECK(client_);
     client_->OnVSyncParametersChanged(timebase, interval);
   }
 
  private:
-  scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context3D_;
   int surface_id_;
-  struct Capabilities capabilities_;
-  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 269 matching lines @@
   delete g_factory;
   g_factory = NULL;
 }
 
 // static
 ImageTransportFactory* ImageTransportFactory::GetInstance() {
   return g_factory;
 }
 
 }  // namespace content