Have a common implementation of cc::OutputSurface

content/renderer/gpu/compositor_output_surface.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/renderer/gpu/compositor_output_surface.h"
 
 #include "base/message_loop_proxy.h"
 #include "cc/compositor_frame.h"
 #include "cc/output_surface_client.h"
 #include "content/common/view_messages.h"
@@ skipping 29 matching lines @@
   uint32 messages_to_filter[] = {ViewMsg_UpdateVSyncParameters::ID};
   return new IPC::ForwardingMessageFilter(
       messages_to_filter, arraysize(messages_to_filter),
       target_task_runner);
 }
 
 CompositorOutputSurface::CompositorOutputSurface(
     int32 routing_id,
     WebGraphicsContext3D* context3D,
     cc::SoftwareOutputDevice* software_device)
-    : output_surface_filter_(
+    : OutputSurface(make_scoped_ptr(context3D),
+                    make_scoped_ptr(software_device)),
+      output_surface_filter_(
           RenderThreadImpl::current()->compositor_output_surface_filter()),
-      client_(NULL),
       routing_id_(routing_id),
-      context3D_(context3D),
-      software_device_(software_device),
       prefers_smoothness_(false),
       main_thread_id_(base::PlatformThread::CurrentId()) {
   DCHECK(output_surface_filter_);
   capabilities_.has_parent_compositor = false;
   DetachFromThread();
 }
 
 CompositorOutputSurface::~CompositorOutputSurface() {
   DCHECK(CalledOnValidThread());
   if (!client_)
     return;
   UpdateSmoothnessTakesPriority(false);
-  output_surface_proxy_->ClearOutputSurface();
+  if (output_surface_proxy_)
+    output_surface_proxy_->ClearOutputSurface();
   output_surface_filter_->RemoveRoute(routing_id_);
 }
 
-const struct cc::OutputSurface::Capabilities&
-    CompositorOutputSurface::Capabilities() const {
-  DCHECK(CalledOnValidThread());
-  return capabilities_;
-}
-
 bool CompositorOutputSurface::BindToClient(
     cc::OutputSurfaceClient* client) {
   DCHECK(CalledOnValidThread());
-  DCHECK(!client_);
-  if (context3D_.get()) {
-    if (!context3D_->makeContextCurrent())
-      return false;
-  }
 
-  client_ = client;
+  if (!cc::OutputSurface::BindToClient(client))
+    return false;
 
   output_surface_proxy_ = new CompositorOutputSurfaceProxy(this);
   output_surface_filter_->AddRoute(
       routing_id_,
       base::Bind(&CompositorOutputSurfaceProxy::OnMessageReceived,
                  output_surface_proxy_));
 
   return true;
 }
 
-WebGraphicsContext3D* CompositorOutputSurface::Context3D() const {
-  DCHECK(CalledOnValidThread());
-  return context3D_.get();
-}
-
-cc::SoftwareOutputDevice* CompositorOutputSurface::SoftwareDevice() const {
-  return software_device_.get();
-}
-
 void CompositorOutputSurface::SendFrameToParentCompositor(
     cc::CompositorFrame* frame) {
   DCHECK(CalledOnValidThread());
   Send(new ViewHostMsg_SwapCompositorFrame(routing_id_, *frame));
 }
 
 void CompositorOutputSurface::OnMessageReceived(const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
   if (!client_)
     return;
@@ skipping 49 matching lines @@
   // If this is the last surface to stop preferring smoothness,
   // Reset the main thread's priority to the default.
   if (prefers_smoothness_ == true &&
       --g_prefer_smoothness_count == 0) {
     SetThreadsPriorityToDefault(main_thread_id_);
   }
   prefers_smoothness_ = prefers_smoothness;
 }
 
 }  // namespace content