cc: Move WebCompositorOutputSurface and related classes into cc/

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"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.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 "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorOutputSurface.h"
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/test_web_graphics_context_3d.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_switches.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
@@ skipping 13 matching lines @@
 };
 
 base::Thread* g_compositor_thread = NULL;
 
 bool test_compositor_enabled = false;
 
 ui::ContextFactory* g_context_factory = NULL;
 
 const int kCompositorLockTimeoutMs = 67;
 
-// Adapts a pure WebGraphicsContext3D into a WebCompositorOutputSurface.
+// Adapts a pure WebGraphicsContext3D into a cc::OutputSurface.
 class WebGraphicsContextToOutputSurfaceAdapter
-    : public WebKit::WebCompositorOutputSurface {
+    : public cc::OutputSurface {
  public:
   explicit WebGraphicsContextToOutputSurfaceAdapter(
       WebKit::WebGraphicsContext3D* context)
       : context3D_(context),
         client_(NULL) {
   }
 
-  virtual bool bindToClient(
-      WebKit::WebCompositorOutputSurfaceClient* client) OVERRIDE {
+  virtual bool BindToClient(
+      cc::OutputSurfaceClient* client) OVERRIDE {
     DCHECK(client);
     if (!context3D_->makeContextCurrent())
       return false;
     client_ = client;
     return true;
   }
 
-  virtual const Capabilities& capabilities() const OVERRIDE {
+  virtual const struct Capabilities& Capabilities() const OVERRIDE {

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

s/struct //

     return capabilities_;
   }
 
-  virtual WebKit::WebGraphicsContext3D* context3D() const OVERRIDE {
+  virtual WebKit::WebGraphicsContext3D* Context3D() const OVERRIDE {
     return context3D_.get();
   }
 
-  virtual void sendFrameToParentCompositor(
-      const WebKit::WebCompositorFrame&) OVERRIDE {
+  virtual cc::SoftwareOutputDevice* SoftwareDevice() const OVERRIDE {
+    return NULL;
+  }
+
+  virtual void SendFrameToParentCompositor(
+      const cc::CompositorFrame&) OVERRIDE {
   }
 
  private:
   scoped_ptr<WebKit::WebGraphicsContext3D> context3D_;
-  Capabilities capabilities_;
-  WebKit::WebCompositorOutputSurfaceClient* client_;
+  struct Capabilities capabilities_;

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

s/struct //

+  cc::OutputSurfaceClient* client_;
 };
 
 class PendingSwap {
  public:
   PendingSwap(SwapType type, ui::PostedSwapQueue* posted_swaps);
   ~PendingSwap();
 
   SwapType type() const { return type_; }
   bool posted() const { return posted_; }
 
@@ skipping 42 matching lines @@
   // TODO(wjmaclean) Remove this when GL initialisation cleaned up.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   if (!gfx::GLSurface::InitializeOneOff() ||
       gfx::GetGLImplementation() == gfx::kGLImplementationNone) {
     LOG(ERROR) << "Could not load the GL bindings";
     return false;
   }
   return true;
 }
 
-WebKit::WebCompositorOutputSurface* DefaultContextFactory::CreateOutputSurface(
+cc::OutputSurface* DefaultContextFactory::CreateOutputSurface(
     Compositor* compositor) {
   return new WebGraphicsContextToOutputSurfaceAdapter(
       CreateContextCommon(compositor, false));
 }
 
 WebKit::WebGraphicsContext3D* DefaultContextFactory::CreateOffscreenContext() {
   return CreateContextCommon(NULL, true);
 }
 
 void DefaultContextFactory::RemoveCompositor(Compositor* compositor) {
@@ skipping 327 matching lines @@
   disable_schedule_composite_ = true;
   if (root_layer_)
     root_layer_->SendDamagedRects();
   disable_schedule_composite_ = false;
 }
 
 void Compositor::applyScrollAndScale(gfx::Vector2d scrollDelta,
                                      float pageScale) {
 }
 
-scoped_ptr<WebKit::WebCompositorOutputSurface>
+scoped_ptr<cc::OutputSurface>
 Compositor::createOutputSurface() {

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

i think this fits on the previous line now, no?

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

yes :)

   if (test_compositor_enabled) {
     ui::TestWebGraphicsContext3D* test_context =
       new ui::TestWebGraphicsContext3D();
     test_context->Initialize();
-    return scoped_ptr<WebKit::WebCompositorOutputSurface>(
+    return scoped_ptr<cc::OutputSurface>(
         new WebGraphicsContextToOutputSurfaceAdapter(test_context));
   } else {
-    return scoped_ptr<WebKit::WebCompositorOutputSurface>(
+    return scoped_ptr<cc::OutputSurface>(
         ContextFactory::GetInstance()->CreateOutputSurface(this));
   }
 }
 
 void Compositor::didRecreateOutputSurface(bool success) {
 }
 
 scoped_ptr<cc::InputHandler> Compositor::createInputHandler() {
   return scoped_ptr<cc::InputHandler>();
 }
@@ skipping 77 matching lines @@
 
 COMPOSITOR_EXPORT void DisableTestCompositor() {
   test_compositor_enabled = false;
 }
 
 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
   return test_compositor_enabled;
 }
 
 }  // namespace ui