GPU compositing surface handle is no longer sent to renderer process.

content/browser/renderer_host/render_widget_host.cc

 // Copyright (c) 2011 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/renderer_host/render_widget_host.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
@@ skipping 82 matching lines @@
   // tell the process host that we're alive.
   process_->WidgetRestored();
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kForceRendererAccessibility)) {
     EnableRendererAccessibility();
   }
 }
 
 RenderWidgetHost::~RenderWidgetHost() {
+  set_view(NULL);
+
   // Clear our current or cached backing store if either remains.
   BackingStoreManager::RemoveBackingStore(this);
 
   process_->Release(routing_id_);
 }
 
+void RenderWidgetHost::set_view(RenderWidgetHostView* view) {
+  view_ = view;
+
+  if (!view_)
+    process_->SetCompositingSurface(routing_id_, gfx::kNullPluginWindow);
+}
+
 gfx::NativeViewId RenderWidgetHost::GetNativeViewId() {
   if (view_)
     return gfx::IdFromNativeView(view_->GetNativeView());
   return 0;
 }
 
 gfx::PluginWindowHandle RenderWidgetHost::GetCompositingSurface() {
   if (view_)
     return view_->GetCompositingSurface();
   return gfx::kNullPluginWindow;
 }
 
 bool RenderWidgetHost::PreHandleKeyboardEvent(
     const NativeWebKeyboardEvent& event,
     bool* is_keyboard_shortcut) {
   return false;
 }
 
 void RenderWidgetHost::Init() {
   DCHECK(process_->HasConnection());
 
   renderer_initialized_ = true;
 
+  process_->SetCompositingSurface(routing_id_,
+                                  GetCompositingSurface());
+
   // Send the ack along with the information on placement.
-  Send(new ViewMsg_CreatingNew_ACK(
-      routing_id_, GetNativeViewId(), GetCompositingSurface()));
+  Send(new ViewMsg_CreatingNew_ACK(routing_id_, GetNativeViewId()));
   WasResized();
 }
 
 void RenderWidgetHost::Shutdown() {
   if (process_->HasConnection()) {
     // Tell the renderer object to close.
     process_->ReportExpectingClose(routing_id_);
     bool rv = Send(new ViewMsg_Close(routing_id_));
     DCHECK(rv);
   }
@@ skipping 213 matching lines @@
   Send(new ViewMsg_SetFocus(routing_id_, false));
 }
 
 void RenderWidgetHost::LostCapture() {
   Send(new ViewMsg_MouseCaptureLost(routing_id_));
 }
 
 void RenderWidgetHost::ViewDestroyed() {
   // TODO(evanm): tracking this may no longer be necessary;
   // eliminate this function if so.
-  view_ = NULL;
+  set_view(NULL);
 }
 
 void RenderWidgetHost::SetIsLoading(bool is_loading) {
   is_loading_ = is_loading;
   if (!view_)
     return;
   view_->SetIsLoading(is_loading);
 }
 
 void RenderWidgetHost::PaintAtSize(TransportDIB::Handle dib_handle,
@@ skipping 818 matching lines @@
     view_->CreatePluginContainer(deferred_plugin_handles_[i]);
 #endif
   }
 
   deferred_plugin_handles_.clear();
 }
 
 void RenderWidgetHost::StartUserGesture() {
   OnUserGesture();
 }