gpu: Separate GpuControlService from GpuControl

gpu/gles2_conform_support/egl/display.h

 // 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.
 
 #ifndef GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
 #define GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
 
 #include <EGL/egl.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
+#include "gpu/command_buffer/client/gpu_control.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
+#include "gpu/command_buffer/service/gpu_control_service.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface.h"
 
 namespace gpu {
 class CommandBufferService;
 class GpuControl;
 class GpuScheduler;
 class TransferBuffer;
 class TransferBufferManagerInterface;
 
 namespace gles2 {
 class GLES2CmdHelper;
 class GLES2Implementation;
 }  // namespace gles2
 }  // namespace gpu
 
 namespace egl {
 
 class Config;
 class Surface;
 
-class Display {
+class Display : private gpu::GpuControl {
  public:
   explicit Display(EGLNativeDisplayType display_id);
   virtual ~Display();
 
   void SetCreateOffscreen(int width, int height) {
     create_offscreen_ = true;
     create_offscreen_width_ = width;
     create_offscreen_height_ = height;
   }
 
@@ skipping 17 matching lines @@
   void SwapBuffers(EGLSurface surface);
 
   // Context routines.
   bool IsValidContext(EGLContext ctx);
   EGLContext CreateContext(EGLConfig config,
                            EGLContext share_ctx,
                            const EGLint* attrib_list);
   void DestroyContext(EGLContext ctx);
   bool MakeCurrent(EGLSurface draw, EGLSurface read, EGLContext ctx);
 
+  // GpuControl implementation.
+  virtual gpu::Capabilities GetCapabilities() OVERRIDE;
+  virtual gfx::GpuMemoryBuffer* CreateGpuMemoryBuffer(size_t width,
+                                                      size_t height,
+                                                      unsigned internalformat,
+                                                      int32* id) OVERRIDE;
+  virtual void DestroyGpuMemoryBuffer(int32 id) OVERRIDE;
+  virtual uint32 InsertSyncPoint() OVERRIDE;
+  virtual void SignalSyncPoint(uint32 sync_point,
+                               const base::Closure& callback) OVERRIDE;
+  virtual void SignalQuery(uint32 query,
+                           const base::Closure& callback) OVERRIDE;
+  virtual void SetSurfaceVisible(bool visible) OVERRIDE;
+  virtual void SendManagedMemoryStats(
+      const gpu::ManagedMemoryStats& stats) OVERRIDE;
+  virtual void Echo(const base::Closure& callback) OVERRIDE;
+  virtual uint32 CreateStreamTexture(uint32 texture_id) OVERRIDE;
+
  private:
   EGLNativeDisplayType display_id_;
 
   bool is_initialized_;
   bool create_offscreen_;
   int create_offscreen_width_;
   int create_offscreen_height_;
 
   scoped_ptr<gpu::TransferBufferManagerInterface> transfer_buffer_manager_;
   scoped_ptr<gpu::CommandBufferService> command_buffer_;
   scoped_ptr<gpu::GpuScheduler> gpu_scheduler_;
   scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
-  scoped_ptr<gpu::GpuControl> gpu_control_;
+  scoped_ptr<gpu::GpuControlService> gpu_control_service_;
   scoped_refptr<gfx::GLContext> gl_context_;
   scoped_refptr<gfx::GLSurface> gl_surface_;
   scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_;
   scoped_ptr<gpu::TransferBuffer> transfer_buffer_;
 
   // TODO(alokp): Support more than one config, surface, and context.
   scoped_ptr<Config> config_;
   scoped_ptr<Surface> surface_;
   scoped_ptr<gpu::gles2::GLES2Implementation> context_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace egl
 
 #endif  // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_