Replace usage of SurfaceId's client_id with FrameSinkId

content/browser/renderer_host/render_widget_host_input_event_router.h

 // Copyright 2015 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_HOST_INPUT_EVENT_ROUTER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_INPUT_EVENT_ROUTER_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 55 matching lines @@
                          blink::WebGestureEvent* event,
                          const ui::LatencyInfo& latency);
   void RouteTouchEvent(RenderWidgetHostViewBase* root_view,
                        blink::WebTouchEvent *event,
                        const ui::LatencyInfo& latency);
 
   void BubbleScrollEvent(RenderWidgetHostViewBase* target_view,
                          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();
   }
 
   void OnHittestData(const FrameHostMsg_HittestData_Params& params);
 
   // Returns the RenderWidgetHostImpl inside the |root_view| at |point| where
   // |point| is with respect to |root_view|'s coordinates. If a RWHI is found,
   // the value of |transformed_point| is the coordinate of the point with
   // respect to the RWHI's coordinates.
   RenderWidgetHostImpl* GetRenderWidgetHostAtPoint(
@@ skipping 13 matching lines @@
             hittest_data);
     bool RejectHitTarget(const cc::SurfaceDrawQuad* surface_quad,
                          const gfx::Point& point_in_quad_space) override;
     bool AcceptHitTarget(const cc::SurfaceDrawQuad* surface_quad,
                          const gfx::Point& point_in_quad_space) override;
 
     const std::unordered_map<cc::SurfaceId, HittestData, cc::SurfaceIdHash>&
         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;
 
     TargetData() : target(nullptr) {}
   };
   using TargetQueue = std::deque<TargetData>;
 
   void ClearAllObserverRegistrations();
 
@@ skipping 18 matching lines @@
                                    RenderWidgetHostViewBase* root_view);
 
   // The following methods take a GestureScrollUpdate event and send a
   // GestureScrollBegin or GestureScrollEnd for wrapping it. This is needed
   // when GestureScrollUpdates are being forwarded for scroll bubbling.
   void SendGestureScrollBegin(RenderWidgetHostViewBase* view,
                               const blink::WebGestureEvent& event);
   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_;
   TargetData touchpad_gesture_target_;
   TargetData bubbling_gesture_scroll_target_;
   TargetData first_bubbling_scroll_target_;
   // Maintains the same target between mouse down and mouse up.
   TargetData mouse_capture_target_;
 
   // Tracked for the purpose of generating MouseEnter and MouseLeave events.
@@ skipping 12 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostInputEventRouter);
   FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest,
                            InputEventRouterGestureTargetQueueTest);
   FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest,
                            InputEventRouterTouchpadGestureTargetTest);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_INPUT_EVENT_ROUTER_H_