Removed kChromiumRendererIdProperty window property.

This property was used by the GPU process to determine whether a particular renderer process had the right to render to a window. It turns out that this is no longer needed because now the browser tells the GPU process which child compositor window to render to and the GPU process trusts the browser process.

Also uncovered and fixed a bug in gpu_channel_host.cc where the renderer would hang if the GPU process failed to return a command buffer.

TEST=try
BUG=64834

Review URL: http://codereview.chromium.org/5607001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68096 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 20 deletions

diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index 4b6271b..ce935f1 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -8,7 +8,6 @@
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "app/view_prop.h"
-#include "app/win/scoped_prop.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
@@ -61,6 +60,8 @@ using WebKit::WebMouseEvent;
 using WebKit::WebTextDirection;
 using webkit_glue::WebPluginGeometry;
 
+const wchar_t kRenderWidgetHostHWNDClass[] = L"Chrome_RenderWidgetHostHWND";
+
 namespace {
 
 // Tooltips will wrap after this width. Yes, wrap. Imagine that!
@@ -308,16 +309,6 @@ RenderWidgetHostViewWin::~RenderWidgetHostViewWin() {
 
 void RenderWidgetHostViewWin::CreateWnd(HWND parent) {
   Create(parent);  // ATL function to create the window.
-
-  // Add a property indicating that a particular renderer is associated with
-  // this window. Used by the GPU process to validate window handles it
-  // receives from renderer processes. As this is used by a separate process we
-  // have to use ScopedProp here instead of ViewProp.
-  int renderer_id = render_widget_host_->process()->id();
-  renderer_id_prop_.reset(
-      new app::win::ScopedProp(m_hWnd,
-                               chrome::kChromiumRendererIdProperty,
-                               reinterpret_cast<HANDLE>(renderer_id)));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -871,7 +862,6 @@ void RenderWidgetHostViewWin::OnDestroy() {
   // sequence as part of the usual cleanup when the plugin instance goes away.
   EnumChildWindows(m_hWnd, DetachPluginWindowsCallback, NULL);
 
-  renderer_id_prop_.reset();
   props_.reset();
 
   CleanupCompositorWindow();
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.h b/chrome/browser/renderer_host/render_widget_host_view_win.h
index 27a9372..1195a0c 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.h
@@ -22,15 +22,11 @@
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
+#include "gfx/native_widget_types.h"
 #include "webkit/glue/webcursor.h"
 
 namespace app {
-
 class ViewProp;
-
-namespace win {
-class ScopedProp;
-}
 }
 
 namespace gfx {
@@ -48,8 +44,7 @@ class RenderWidgetHost;
 typedef CWinTraits<WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0>
     RenderWidgetHostHWNDTraits;
 
-static const wchar_t* const kRenderWidgetHostHWNDClass =
-    L"Chrome_RenderWidgetHostHWND";
+extern const wchar_t kRenderWidgetHostHWNDClass[];
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewWin
@@ -355,7 +350,6 @@ class RenderWidgetHostViewWin
   WebKit::WebTextInputType text_input_type_;
 
   ScopedVector<app::ViewProp> props_;
-  scoped_ptr<app::win::ScopedProp> renderer_id_prop_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
 };