gpu: Remove map_image field from gpu::Capabilities.

gpu/command_buffer/service/gpu_control_service.cc

 // Copyright 2013 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/command_buffer/service/gpu_control_service.h"
 
 #include "gpu/command_buffer/client/gpu_memory_buffer_factory.h"
 #include "gpu/command_buffer/service/gpu_memory_buffer_manager.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/query_manager.h"
 
 namespace gpu {
 
 GpuControlService::GpuControlService(
     GpuMemoryBufferManagerInterface* gpu_memory_buffer_manager,
     GpuMemoryBufferFactory* gpu_memory_buffer_factory,
     gles2::MailboxManager* mailbox_manager,
-    gles2::QueryManager* query_manager,
-    const gpu::Capabilities& decoder_capabilities)
+    gles2::QueryManager* query_manager)
     : gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
       gpu_memory_buffer_factory_(gpu_memory_buffer_factory),
       mailbox_manager_(mailbox_manager),
-      query_manager_(query_manager),
-      capabilities_(decoder_capabilities) {
-  capabilities_.map_image =
-      gpu_memory_buffer_manager_ && gpu_memory_buffer_factory_;
+      query_manager_(query_manager) {
 }
 
 GpuControlService::~GpuControlService() {
 }
 
-gpu::Capabilities GpuControlService::GetCapabilities() {
-  return capabilities_;
-}
-
 gfx::GpuMemoryBuffer* GpuControlService::CreateGpuMemoryBuffer(
     size_t width,
     size_t height,
     unsigned internalformat,
     int32* id) {
   *id = -1;
 
-  CHECK(gpu_memory_buffer_factory_) << "No GPU memory buffer factory provided";
+  DCHECK(gpu_memory_buffer_factory_);

[reveman, 2014/03/22 13:35:21]

Note: I change this to a DCHECK for consistency and removed the message as I
don't think it adds anything.

   linked_ptr<gfx::GpuMemoryBuffer> buffer = make_linked_ptr(
       gpu_memory_buffer_factory_->CreateGpuMemoryBuffer(width,
                                                         height,
                                                         internalformat));
   if (!buffer.get())
     return NULL;
 
   static int32 next_id = 1;
   *id = next_id++;
 
@@ skipping 55 matching lines @@
   NOTREACHED();
   return 0;
 }
 
 bool GpuControlService::RegisterGpuMemoryBuffer(
     int32 id,
     gfx::GpuMemoryBufferHandle buffer,
     size_t width,
     size_t height,
     unsigned internalformat) {
+  DCHECK(gpu_memory_buffer_manager_);
   return gpu_memory_buffer_manager_->RegisterGpuMemoryBuffer(id,
                                                              buffer,
                                                              width,
                                                              height,
                                                              internalformat);
 }
 
 }  // namespace gpu