Merge 283085 "Added more detailed result codes for CreateViewCom..."

content/common/gpu/client/gpu_channel_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/common/gpu/client/gpu_channel_host.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 124 matching lines @@
                "surface_id",
                surface_id);
 
   GPUCreateCommandBufferConfig init_params;
   init_params.share_group_id =
       share_group ? share_group->GetRouteID() : MSG_ROUTING_NONE;
   init_params.attribs = attribs;
   init_params.active_url = active_url;
   init_params.gpu_preference = gpu_preference;
   int32 route_id = GenerateRouteID();
-  if (!factory_->CreateViewCommandBuffer(surface_id, init_params, route_id)) {
+  CreateCommandBufferResult result = factory_->CreateViewCommandBuffer(
+      surface_id, init_params, route_id);
+  if (result != CREATE_COMMAND_BUFFER_SUCCEEDED) {
     LOG(ERROR) << "GpuChannelHost::CreateViewCommandBuffer failed.";
 
-    // The most likely reason CreateViewCommandBuffer will fail is
-    // that the GPU process crashed. In this case the GPU channel
-    // needs to be considered lost. The caller will then set up a new
-    // connection, and the GPU channel and any view command buffers
-    // will all be associated with the same GPU process.
-    DCHECK(MessageLoopProxy::current().get());
+    if (result == CREATE_COMMAND_BUFFER_FAILED_AND_CHANNEL_LOST) {
+      // The GPU channel needs to be considered lost. The caller will
+      // then set up a new connection, and the GPU channel and any
+      // view command buffers will all be associated with the same GPU
+      // process.
+      DCHECK(MessageLoopProxy::current().get());
 
-    scoped_refptr<base::MessageLoopProxy> io_loop = factory_->GetIOLoopProxy();
-    io_loop->PostTask(FROM_HERE,
-                      base::Bind(&GpuChannelHost::MessageFilter::OnChannelError,
-                                 channel_filter_.get()));
+      scoped_refptr<base::MessageLoopProxy> io_loop =
+          factory_->GetIOLoopProxy();
+      io_loop->PostTask(
+          FROM_HERE,
+          base::Bind(&GpuChannelHost::MessageFilter::OnChannelError,
+                     channel_filter_.get()));
+    }
 
     return NULL;
   }
 
   CommandBufferProxyImpl* command_buffer =
       new CommandBufferProxyImpl(this, route_id);
   AddRoute(route_id, command_buffer->AsWeakPtr());
 
   AutoLock lock(context_lock_);
   proxies_[route_id] = command_buffer;
@@ skipping 221 matching lines @@
 
   listeners_.clear();
 }
 
 bool GpuChannelHost::MessageFilter::IsLost() const {
   AutoLock lock(lock_);
   return lost_;
 }
 
 }  // namespace content