gpu: Separate GpuControlService from GpuControl

gpu/gles2_conform_support/egl/display.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 "gpu/gles2_conform_support/egl/display.h"
 
 #include <vector>
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
 #include "gpu/command_buffer/service/context_group.h"
-#include "gpu/command_buffer/service/gpu_control_service.h"
 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
 #include "gpu/gles2_conform_support/egl/config.h"
 #include "gpu/gles2_conform_support/egl/surface.h"
 
 namespace {
 const int32 kCommandBufferSize = 1024 * 1024;
 const int32 kTransferBufferSize = 512 * 1024;
 }
 
 namespace egl {
@@ skipping 138 matching lines @@
 
   if (!decoder_->Initialize(gl_surface_.get(),
                             gl_context_.get(),
                             gl_surface_->IsOffscreen(),
                             size,
                             gpu::gles2::DisallowedFeatures(),
                             attribs)) {
     return EGL_NO_SURFACE;
   }
 
-  gpu_control_.reset(new gpu::GpuControlService(
-      NULL, NULL, group->mailbox_manager(), NULL, decoder_->GetCapabilities()));
+  gpu_control_service_.reset(
+      new gpu::GpuControlService(NULL, group->mailbox_manager(), NULL));
 
   command_buffer->SetPutOffsetChangeCallback(
       base::Bind(&gpu::GpuScheduler::PutChanged,
                  base::Unretained(gpu_scheduler_.get())));
   command_buffer->SetGetBufferChangeCallback(
       base::Bind(&gpu::GpuScheduler::SetGetBuffer,
                  base::Unretained(gpu_scheduler_.get())));
 
   scoped_ptr<gpu::gles2::GLES2CmdHelper> cmd_helper(
       new gpu::gles2::GLES2CmdHelper(command_buffer.get()));
@@ skipping 45 matching lines @@
 
   bool bind_generates_resources = true;
   bool lose_context_when_out_of_memory = false;
 
   context_.reset(
       new gpu::gles2::GLES2Implementation(gles2_cmd_helper_.get(),
                                           NULL,
                                           transfer_buffer_.get(),
                                           bind_generates_resources,
                                           lose_context_when_out_of_memory,
-                                          gpu_control_.get()));
+                                          this));
 
   if (!context_->Initialize(
       kTransferBufferSize,
       kTransferBufferSize / 2,
       kTransferBufferSize * 2,
       gpu::gles2::GLES2Implementation::kNoLimit)) {
     return EGL_NO_CONTEXT;
   }
 
   context_->EnableFeatureCHROMIUM("pepper3d_allow_buffers_on_multiple_targets");
@@ skipping 13 matching lines @@
     gles2::SetGLContext(NULL);
   } else {
     DCHECK(IsValidSurface(draw));
     DCHECK(IsValidSurface(read));
     DCHECK(IsValidContext(ctx));
     gles2::SetGLContext(context_.get());
   }
   return true;
 }
 
+gpu::Capabilities Display::GetCapabilities() {
+  return decoder_->GetCapabilities();
+}
+
+gfx::GpuMemoryBuffer* Display::CreateGpuMemoryBuffer(
+    size_t width,
+    size_t height,
+    unsigned internalformat,
+    int32* id) {
+  NOTIMPLEMENTED();
+  return NULL;
+}
+
+void Display::DestroyGpuMemoryBuffer(int32 id) {
+  NOTIMPLEMENTED();
+}
+
+uint32 Display::InsertSyncPoint() {
+  NOTIMPLEMENTED();
+  return 0u;
+}
+
+void Display::SignalSyncPoint(uint32 sync_point,
+                             const base::Closure& callback) {
+  NOTIMPLEMENTED();
+}
+
+void Display::SignalQuery(uint32 query, const base::Closure& callback) {
+  NOTIMPLEMENTED();
+}
+
+void Display::SetSurfaceVisible(bool visible) {
+  NOTIMPLEMENTED();
+}
+
+void Display::SendManagedMemoryStats(const gpu::ManagedMemoryStats& stats) {
+  NOTIMPLEMENTED();
+}
+
+void Display::Echo(const base::Closure& callback) {
+  NOTIMPLEMENTED();
+}
+
+uint32 Display::CreateStreamTexture(uint32 texture_id) {
+  NOTIMPLEMENTED();
+  return 0;
+}
+
 }  // namespace egl