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

content/browser/renderer_host/render_widget_helper.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 101 matching lines @@
   void CrossSiteSwapOutACK(const ViewMsg_SwapOut_Params& params);
   bool WaitForUpdateMsg(int render_widget_id,
                         const base::TimeDelta& max_delay,
                         IPC::Message* msg);
 
 #if defined(OS_MACOSX)
   // Given the id of a transport DIB, return a mapping to it or NULL on error.
   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.
   void DidReceiveUpdateMsg(const IPC::Message& msg);
 
   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
   // |cache_in_browser| is |true|, then a copy of the shmem is kept by the
   // browser, and it is the caller's repsonsibility to call
   // FreeTransportDIB().  In all cases, the caller is responsible for deleting
   // the resulting TransportDIB.
   void AllocTransportDIB(size_t size,
                          bool cache_in_browser,
                          TransportDIB::Handle* result);
 
   // Called on the IO thread to handle the freeing of a transport DIB
   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.
   class UpdateMsgProxy;
   friend class UpdateMsgProxy;
   friend class base::RefCountedThreadSafe<RenderWidgetHelper>;
 
   typedef std::deque<UpdateMsgProxy*> UpdateMsgProxyQueue;
   // Map from render_widget_id to a queue of live PaintMsgProxy instances.
   typedef base::hash_map<int, UpdateMsgProxyQueue > UpdateMsgProxyMap;
@@ skipping 36 matching lines @@
   base::Lock allocated_dibs_lock_;
   std::map<TransportDIB::Id, int> allocated_dibs_;
 #endif
 
   // A map of live paint messages.  Must hold pending_paints_lock_ to access.
   // The UpdateMsgProxy objects are not owned by this map.  (See UpdateMsgProxy
   // for details about how the lifetime of instances are managed.)
   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.
   base::WaitableEvent event_;
 
   // The next routing id to use.
   base::AtomicSequenceNumber next_routing_id_;
 
   ResourceDispatcherHost* resource_dispatcher_host_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHelper);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_