WIP: Propagate SurfaceID up window tree hierarchy

content/browser/renderer_host/render_widget_host_input_event_router.h

Index: content/browser/renderer_host/render_widget_host_input_event_router.h
diff --git a/content/browser/renderer_host/render_widget_host_input_event_router.h b/content/browser/renderer_host/render_widget_host_input_event_router.h
index 19d8fb89a73b317c93f0aeab2e2d0714f395fcc0..983ed690f852fa40a31ca454af67cce8e8940dc4 100644
--- a/content/browser/renderer_host/render_widget_host_input_event_router.h
+++ b/content/browser/renderer_host/render_widget_host_input_event_router.h
@@ -72,10 +72,11 @@ class CONTENT_EXPORT RenderWidgetHostInputEventRouter
                          const blink::WebGestureEvent& event);
   void CancelScrollBubbling(RenderWidgetHostViewBase* target_view);
 
-  void AddSurfaceClientIdOwner(uint32_t id, RenderWidgetHostViewBase* owner);
-  void RemoveSurfaceClientIdOwner(uint32_t id);
+  void AddFrameSinkIdOwner(const cc::FrameSinkId& id,
+                           RenderWidgetHostViewBase* owner);
+  void RemoveFrameSinkIdOwner(const cc::FrameSinkId& id);
 
-  bool is_registered(uint32_t id) {
+  bool is_registered(const cc::FrameSinkId& id) {
     return owner_map_.find(id) != owner_map_.end();
   }
 
@@ -100,8 +101,9 @@ class CONTENT_EXPORT RenderWidgetHostInputEventRouter
         hittest_data_;
   };
 
-  using SurfaceClientIdOwnerMap =
-      base::hash_map<uint32_t, RenderWidgetHostViewBase*>;
+  using FrameSinkIdOwnerMap = std::unordered_map<cc::FrameSinkId,
+                                                 RenderWidgetHostViewBase*,
+                                                 cc::FrameSinkIdHash>;
   struct TargetData {
     RenderWidgetHostViewBase* target;
     gfx::Vector2d delta;
@@ -140,7 +142,7 @@ class CONTENT_EXPORT RenderWidgetHostInputEventRouter
   void SendGestureScrollEnd(RenderWidgetHostViewBase* view,
                             const blink::WebGestureEvent& event);
 
-  SurfaceClientIdOwnerMap owner_map_;
+  FrameSinkIdOwnerMap owner_map_;
   TargetQueue touchscreen_gesture_target_queue_;
   TargetData touch_target_;
   TargetData touchscreen_gesture_target_;