Added more detailed result codes for CreateViewCommandBuffer.

content/browser/gpu/gpu_process_host.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 "content/browser/gpu/gpu_process_host.h"
 
 #include "base/base64.h"
 #include "base/base_switches.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 628 matching lines @@
 
   DCHECK(CalledOnValidThread());
 
   if (!compositing_surface.is_null() &&
       Send(new GpuMsg_CreateViewCommandBuffer(
           compositing_surface, surface_id, client_id, init_params, route_id))) {
     create_command_buffer_requests_.push(callback);
     surface_refs_.insert(std::make_pair(surface_id,
         GpuSurfaceTracker::GetInstance()->GetSurfaceRefForSurface(surface_id)));
   } else {
-    callback.Run(false);
+    // Could distinguish here between compositing_surface being NULL
+    // and Send failing, if desired.

[piman, 2014/07/11 23:20:09]

Really, we should assert and fix it upstream

+    callback.Run(CREATE_CMDBUF_FAILED_AND_CHANNEL_LOST);
   }
 }
 
 void GpuProcessHost::CreateImage(gfx::PluginWindowHandle window,
                                  int client_id,
                                  int image_id,
                                  const CreateImageCallback& callback) {
   TRACE_EVENT0("gpu", "GpuProcessHost::CreateImage");
 
   DCHECK(CalledOnValidThread());
@@ skipping 87 matching lines @@
 
 void GpuProcessHost::OnCommandBufferCreated(bool succeeded) {
   TRACE_EVENT0("gpu", "GpuProcessHost::OnCommandBufferCreated");
 
   if (create_command_buffer_requests_.empty())
     return;
 
   CreateCommandBufferCallback callback =
       create_command_buffer_requests_.front();
   create_command_buffer_requests_.pop();
-  callback.Run(succeeded);
+  callback.Run(succeeded ? CREATE_CMDBUF_SUCCEEDED : CREATE_CMDBUF_FAILED);

[piman, 2014/07/11 23:20:09]

ideally we'd pass a CreateCommandBufferResult back from the GPU process. Looking
at it currently the only reason this fails is if the client messed up its
routing id allocation (or is malicious), or it wrapeed around and we collided...
should we cause a CHANNEL_LOST in that case? We might be able to recover
slightly better.

[Ken Russell (switch to Gerrit), 2014/07/12 00:44:52]

Thanks, that sounds cleaner. I've implemented this.

 }
 
 void GpuProcessHost::OnDestroyCommandBuffer(int32 surface_id) {
   TRACE_EVENT0("gpu", "GpuProcessHost::OnDestroyCommandBuffer");
   SurfaceRefMap::iterator it = surface_refs_.find(surface_id);
   if (it != surface_refs_.end()) {
     surface_refs_.erase(it);
   }
 }
 
@@ skipping 286 matching lines @@
   while (!channel_requests_.empty()) {
     EstablishChannelCallback callback = channel_requests_.front();
     channel_requests_.pop();
     callback.Run(IPC::ChannelHandle(), gpu::GPUInfo());
   }
 
   while (!create_command_buffer_requests_.empty()) {
     CreateCommandBufferCallback callback =
         create_command_buffer_requests_.front();
     create_command_buffer_requests_.pop();
-    callback.Run(false);
+    callback.Run(CREATE_CMDBUF_FAILED_AND_CHANNEL_LOST);
   }
 }
 
 void GpuProcessHost::BlockLiveOffscreenContexts() {
   for (std::multiset<GURL>::iterator iter =
            urls_with_live_offscreen_contexts_.begin();
        iter != urls_with_live_offscreen_contexts_.end(); ++iter) {
     GpuDataManagerImpl::GetInstance()->BlockDomainFrom3DAPIs(
         *iter, GpuDataManagerImpl::DOMAIN_GUILT_UNKNOWN);
   }
@@ skipping 44 matching lines @@
   TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
   ClientIdToShaderCacheMap::iterator iter =
       client_id_to_shader_cache_.find(client_id);
   // If the cache doesn't exist then this is an off the record profile.
   if (iter == client_id_to_shader_cache_.end())
     return;
   iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
 }
 
 }  // namespace content