Have a common implementation of cc::OutputSurface

ui/compositor/compositor.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 "ui/compositor/compositor.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/bind.h"
@@ skipping 34 matching lines @@
 };
 
 base::Thread* g_compositor_thread = NULL;
 
 bool g_test_compositor_enabled = false;
 
 ui::ContextFactory* g_context_factory = NULL;
 
 const int kCompositorLockTimeoutMs = 67;
 
-// Adapts a pure WebGraphicsContext3D into a cc::OutputSurface.
-class WebGraphicsContextToOutputSurfaceAdapter
-    : public cc::OutputSurface {
- public:
-  explicit WebGraphicsContextToOutputSurfaceAdapter(
-      WebKit::WebGraphicsContext3D* context)
-      : context3D_(context),
-        client_(NULL) {
-  }
-
-  virtual bool BindToClient(
-      cc::OutputSurfaceClient* client) OVERRIDE {
-    DCHECK(client);
-    if (!context3D_->makeContextCurrent())
-      return false;
-    client_ = client;
-    return true;
-  }
-
-  virtual const struct Capabilities& Capabilities() const OVERRIDE {
-    return capabilities_;
-  }
-
-  virtual WebKit::WebGraphicsContext3D* Context3D() const OVERRIDE {
-    return context3D_.get();
-  }
-
-  virtual cc::SoftwareOutputDevice* SoftwareDevice() const OVERRIDE {
-    return NULL;
-  }
-
-  virtual void SendFrameToParentCompositor(cc::CompositorFrame*) OVERRIDE {
-  }
-
- private:
-  scoped_ptr<WebKit::WebGraphicsContext3D> context3D_;
-  struct Capabilities capabilities_;
-  cc::OutputSurfaceClient* client_;
-};
-
 class PendingSwap {
  public:
   PendingSwap(SwapType type, ui::PostedSwapQueue* posted_swaps);
   ~PendingSwap();
 
   SwapType type() const { return type_; }
   bool posted() const { return posted_; }
 
  private:
   friend class ui::PostedSwapQueue;
@@ skipping 42 matching lines @@
   if (!gfx::GLSurface::InitializeOneOff() ||
       gfx::GetGLImplementation() == gfx::kGLImplementationNone) {
     LOG(ERROR) << "Could not load the GL bindings";
     return false;
   }
   return true;
 }
 
 cc::OutputSurface* DefaultContextFactory::CreateOutputSurface(
     Compositor* compositor) {
-  return new WebGraphicsContextToOutputSurfaceAdapter(
-      CreateContextCommon(compositor, false));
+  return new cc::OutputSurface(
+      make_scoped_ptr(CreateContextCommon(compositor, false)));
 }
 
 WebKit::WebGraphicsContext3D* DefaultContextFactory::CreateOffscreenContext() {
   return CreateContextCommon(NULL, true);
 }
 
 void DefaultContextFactory::RemoveCompositor(Compositor* compositor) {
 }
 
 WebKit::WebGraphicsContext3D* DefaultContextFactory::CreateContextCommon(
@@ skipping 330 matching lines @@
     root_layer_->SendDamagedRects();
   disable_schedule_composite_ = false;
 }
 
 void Compositor::applyScrollAndScale(gfx::Vector2d scrollDelta,
                                      float pageScale) {
 }
 
 scoped_ptr<cc::OutputSurface> Compositor::createOutputSurface() {
   if (g_test_compositor_enabled) {
-    ui::TestWebGraphicsContext3D* test_context =
-      new ui::TestWebGraphicsContext3D();
-    test_context->Initialize();
-    return scoped_ptr<cc::OutputSurface>(
-        new WebGraphicsContextToOutputSurfaceAdapter(test_context));
+    scoped_ptr<ui::TestWebGraphicsContext3D> context3d(
+        new ui::TestWebGraphicsContext3D);
+    context3d->Initialize();
+    return make_scoped_ptr(new cc::OutputSurface(
+        context3d.PassAs<WebKit::WebGraphicsContext3D>()));
   } else {
-    return scoped_ptr<cc::OutputSurface>(
+    return make_scoped_ptr(
         ContextFactory::GetInstance()->CreateOutputSurface(this));
   }
 }
 
 void Compositor::didRecreateOutputSurface(bool success) {
 }
 
 scoped_ptr<cc::InputHandler> Compositor::createInputHandler() {
   return scoped_ptr<cc::InputHandler>();
 }
@@ skipping 73 matching lines @@
 
 COMPOSITOR_EXPORT void DisableTestCompositor() {
   g_test_compositor_enabled = false;
 }
 
 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
   return g_test_compositor_enabled;
 }
 
 }  // namespace ui