gpu: reference target surfaces through a globally unique surface id.

content/browser/renderer_host/render_widget_helper.h

Index: content/browser/renderer_host/render_widget_helper.h
diff --git a/content/browser/renderer_host/render_widget_helper.h b/content/browser/renderer_host/render_widget_helper.h
index 766566aaa3b5ef42eda7f997c694a5dfbb317f27..6fd5ca5b56334efe5a520ddd15bcfc33bab2e7d6 100644
--- a/content/browser/renderer_host/render_widget_helper.h
+++ b/content/browser/renderer_host/render_widget_helper.h
@@ -119,11 +119,6 @@ class RenderWidgetHelper
   TransportDIB* MapTransportDIB(TransportDIB::Id dib_id);
 #endif
 
-  // Set a mapping from a RenderWidgetHost to a compositing surface. Pass a null
-  // handle to remove the mapping.
-  void SetCompositingSurface(int render_widget_id,
-                             gfx::PluginWindowHandle compositing_surface);
-
   // IO THREAD ONLY -----------------------------------------------------------
 
   // Called on the IO thread when a UpdateRect message is received.
@@ -131,11 +126,13 @@ class RenderWidgetHelper
 
   void CreateNewWindow(const ViewHostMsg_CreateWindow_Params& params,
                        base::ProcessHandle render_process,
-                       int* route_id);
+                       int* route_id,
+                       int* surface_id);
   void CreateNewWidget(int opener_id,
                        WebKit::WebPopupType popup_type,
-                       int* route_id);
-  void CreateNewFullscreenWidget(int opener_id, int* route_id);
+                       int* route_id,
+                       int* surface_id);
+  void CreateNewFullscreenWidget(int opener_id, int* route_id, int* surface_id);
 
 #if defined(OS_MACOSX)
   // Called on the IO thread to handle the allocation of a TransportDIB.  If
@@ -151,9 +148,6 @@ class RenderWidgetHelper
   void FreeTransportDIB(TransportDIB::Id dib_id);
 #endif
 
-  // Lookup the compositing surface corresponding to a widget ID.
-  gfx::PluginWindowHandle LookupCompositingSurface(int render_widget_id);
-
  private:
   // A class used to proxy a paint message.  PaintMsgProxy objects are created
   // on the IO thread and destroyed on the UI thread.
@@ -210,11 +204,6 @@ class RenderWidgetHelper
   UpdateMsgProxyMap pending_paints_;
   base::Lock pending_paints_lock_;
 
-  // Maps from view ID to compositing surface.
-  typedef std::map<int, gfx::PluginWindowHandle> ViewCompositingSurfaceMap;
-  ViewCompositingSurfaceMap view_compositing_surface_map_;
-  base::Lock view_compositing_surface_map_lock_;
-
   int render_process_id_;
 
   // Event used to implement WaitForUpdateMsg.