Removed kChromiumRendererIdProperty window property....

chrome/gpu/gpu_channel.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/gpu/gpu_channel.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 101 matching lines @@
 int GpuChannel::GenerateRouteID() {
   static int last_id = 0;
   return ++last_id;
 }
 
 void GpuChannel::OnCreateViewCommandBuffer(
     gfx::NativeViewId view_id,
     int32 render_view_id,
     const GPUCreateCommandBufferConfig& init_params,
     int32* route_id) {
-  *route_id = 0;
+  *route_id = MSG_ROUTING_NONE;
 
 #if defined(ENABLE_GPU)
 
   gfx::PluginWindowHandle handle = gfx::kNullPluginWindow;
 #if defined(OS_WIN)
-  gfx::NativeView view = gfx::NativeViewFromId(view_id);
-
-  // Check that the calling renderer is allowed to render to this window.
-  // TODO(apatrick): consider killing the renderer process rather than failing.
-  int view_renderer_id = reinterpret_cast<int>(
-      GetProp(view, chrome::kChromiumRendererIdProperty));
-  if (view_renderer_id != renderer_id_)
-    return;
-
-  // Note, we don't actually render into the view HWND. Instead, inside
-  // the GpuCommandBufferStub, we will create a child window within the view
-  // HWND into which we will render.
-  handle = view;
+  // TODO(apatrick): We don't actually need the window handle on the Windows
+  // platform. At this point, it only indicates to the GpuCommandBufferStub
+  // whether onscreen or offscreen rendering is requested. The window handle
+  // that will be rendered to is the child compositor window and that window
+  // handle is provided by the browser process. Looking at what we are doing on
+  // this and other platforms, I think a redesign is in order here. Perhaps
+  // on all platforms the renderer just indicates whether it wants onscreen or
+  // offscreen rendering and the browser provides whichever platform specific
+  // "render target" the GpuCommandBufferStub targets.
+  handle = gfx::NativeViewFromId(view_id);
 #elif defined(OS_LINUX)
   ChildThread* gpu_thread = ChildThread::current();
   // Ask the browser for the view's XID.
   // TODO(piman): This assumes that it doesn't change. It can change however
   // when tearing off tabs. This needs a fix in the browser UI code. A possible
   // alternative would be to add a socket/plug pair like with plugins but that
   // has issues with events and focus.
   gpu_thread->Send(new GpuHostMsg_GetViewXID(view_id, &handle));
 #elif defined(OS_MACOSX)
   // On Mac OS X we currently pass a (fake) PluginWindowHandle for the
@@ skipping 36 matching lines @@
       parent_stub,
       size,
       init_params.allowed_extensions,
       init_params.attribs,
       parent_texture_id,
       *route_id,
       0, 0));
   router_.AddRoute(*route_id, stub.get());
   stubs_.AddWithID(stub.release(), *route_id);
 #else
-  *route_id = 0;
+  *route_id = MSG_ROUTING_NONE;
 #endif
 }
 
 void GpuChannel::OnDestroyCommandBuffer(int32 route_id) {
 #if defined(ENABLE_GPU)
   router_.RemoveRoute(route_id);
   stubs_.Remove(route_id);
 #endif
 }
 
@@ skipping 50 matching lines @@
       channel_name, IPC::Channel::MODE_SERVER, this, NULL,
       ChildProcess::current()->io_message_loop(), false,
       ChildProcess::current()->GetShutDownEvent()));
 
   return true;
 }
 
 std::string GpuChannel::GetChannelName() {
   return StringPrintf("%d.r%d", base::GetCurrentProcId(), renderer_id_);
 }