Removed kChromiumRendererIdProperty window property....

chrome/renderer/gpu_channel_host.cc

 // Copyright (c) 2010 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 "chrome/renderer/gpu_channel_host.h"
 
 #include "chrome/common/child_process.h"
 #include "chrome/common/gpu_create_command_buffer_config.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/renderer/command_buffer_proxy.h"
@@ skipping 79 matching lines @@
     int render_view_id,
     const std::string& allowed_extensions,
     const std::vector<int32>& attribs) {
 #if defined(ENABLE_GPU)
   // An error occurred. Need to get the host again to reinitialize it.
   if (!channel_.get())
     return NULL;
 
   GPUCreateCommandBufferConfig init_params(allowed_extensions, attribs);
   int32 route_id;
-  if (!Send(new GpuChannelMsg_CreateViewCommandBuffer(
-      view,
-      render_view_id,
-      init_params,
-      &route_id)) &&
-      route_id != MSG_ROUTING_NONE) {
+  if (!Send(new GpuChannelMsg_CreateViewCommandBuffer(view,
+                                                      render_view_id,
+                                                      init_params,
+                                                      &route_id))) {
     return NULL;
   }
 
+  if (route_id == MSG_ROUTING_NONE)
+    return NULL;
+
   CommandBufferProxy* command_buffer = new CommandBufferProxy(this, route_id);
   router_.AddRoute(route_id, command_buffer);
   proxies_[route_id] = command_buffer;
   return command_buffer;
 #else
   return NULL;
 #endif
 }
 
 CommandBufferProxy* GpuChannelHost::CreateOffscreenCommandBuffer(
     CommandBufferProxy* parent,
     const gfx::Size& size,
     const std::string& allowed_extensions,
     const std::vector<int32>& attribs,
     uint32 parent_texture_id) {
 #if defined(ENABLE_GPU)
   // An error occurred. Need to get the host again to reinitialize it.
   if (!channel_.get())
     return NULL;
 
   GPUCreateCommandBufferConfig init_params(allowed_extensions, attribs);
   int32 parent_route_id = parent ? parent->route_id() : 0;
   int32 route_id;
   if (!Send(new GpuChannelMsg_CreateOffscreenCommandBuffer(parent_route_id,
                                                            size,
                                                            init_params,
                                                            parent_texture_id,
-                                                           &route_id)) &&
-      route_id != MSG_ROUTING_NONE) {
+                                                           &route_id))) {
     return NULL;
   }
 
+  if (route_id == MSG_ROUTING_NONE)
+    return NULL;
+
   CommandBufferProxy* command_buffer = new CommandBufferProxy(this, route_id);
   router_.AddRoute(route_id, command_buffer);
   proxies_[route_id] = command_buffer;
   return command_buffer;
 #else
   return NULL;
 #endif
 }
 
 void GpuChannelHost::DestroyCommandBuffer(CommandBufferProxy* command_buffer) {
 #if defined(ENABLE_GPU)
   Send(new GpuChannelMsg_DestroyCommandBuffer(command_buffer->route_id()));
 
   // Check the proxy has not already been removed after a channel error.
   int route_id = command_buffer->route_id();
   if (proxies_.find(command_buffer->route_id()) != proxies_.end()) {
     proxies_.erase(route_id);
     router_.RemoveRoute(route_id);
   }
 
   delete command_buffer;
 #endif
 }