WIP: Propagate SurfaceID up window tree hierarchy

content/browser/renderer_host/render_widget_host_input_event_router.cc

 // 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.
 
 #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
 
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
 
@@ skipping 138 matching lines @@
   }
 
   // The hittest delegate is used to reject hittesting quads based on extra
   // hittesting data send by the renderer.
   HittestDelegate delegate(hittest_data_);
 
   // The conversion of point to transform_point is done over the course of the
   // hit testing, and reflect transformations that would normally be applied in
   // the renderer process if the event was being routed between frames within a
   // single process with only one RenderWidgetHost.
-  uint32_t surface_client_id =
-      root_view->SurfaceClientIdAtPoint(&delegate, point, transformed_point);
-  const SurfaceClientIdOwnerMap::iterator iter =
-      owner_map_.find(surface_client_id);
+  cc::FrameSinkId frame_sink_id =
+      root_view->FrameSinkIdAtPoint(&delegate, point, transformed_point);
+  const FrameSinkIdOwnerMap::iterator iter = owner_map_.find(frame_sink_id);
   // If the point hit a Surface whose namspace is no longer in the map, then
   // it likely means the RenderWidgetHostView has been destroyed but its
   // parent frame has not sent a new compositor frame since that happened.
   if (iter == owner_map_.end())
     return root_view;
 
   return iter->second;
 }
 
 void RenderWidgetHostInputEventRouter::RouteMouseEvent(
@@ skipping 387 matching lines @@
 
 void RenderWidgetHostInputEventRouter::CancelScrollBubbling(
     RenderWidgetHostViewBase* target_view) {
   DCHECK(target_view);
   if (target_view == first_bubbling_scroll_target_.target) {
     first_bubbling_scroll_target_.target = nullptr;
     bubbling_gesture_scroll_target_.target = nullptr;
   }
 }
 
-void RenderWidgetHostInputEventRouter::AddSurfaceClientIdOwner(
-    uint32_t id,
+void RenderWidgetHostInputEventRouter::AddFrameSinkIdOwner(
+    const cc::FrameSinkId& id,
     RenderWidgetHostViewBase* owner) {
   DCHECK(owner_map_.find(id) == owner_map_.end());
   // We want to be notified if the owner is destroyed so we can remove it from
   // our map.
   owner->AddObserver(this);
   owner_map_.insert(std::make_pair(id, owner));
 }
 
-void RenderWidgetHostInputEventRouter::RemoveSurfaceClientIdOwner(uint32_t id) {
+void RenderWidgetHostInputEventRouter::RemoveFrameSinkIdOwner(
+    const cc::FrameSinkId& id) {
   auto it_to_remove = owner_map_.find(id);
   if (it_to_remove != owner_map_.end()) {
     it_to_remove->second->RemoveObserver(this);
     owner_map_.erase(it_to_remove);
   }
 
   for (auto it = hittest_data_.begin(); it != hittest_data_.end();) {
-    if (it->first.client_id() == id)
+    if (it->first.frame_sink_id() == id)
       it = hittest_data_.erase(it);
     else
       ++it;
   }
 }
 
 void RenderWidgetHostInputEventRouter::OnHittestData(
     const FrameHostMsg_HittestData_Params& params) {
-  if (owner_map_.find(params.surface_id.client_id()) == owner_map_.end()) {
+  if (owner_map_.find(params.surface_id.frame_sink_id()) == owner_map_.end()) {
     return;
   }
   HittestData data;
   data.ignored_for_hittest = params.ignored_for_hittest;
   hittest_data_[params.surface_id] = data;
 }
 
 void RenderWidgetHostInputEventRouter::RouteTouchscreenGestureEvent(
     RenderWidgetHostViewBase* root_view,
     blink::WebGestureEvent* event,
@@ skipping 111 matching lines @@
   if (!touchpad_gesture_target_.target)
     return;
 
   // TODO(mohsen): Add tests to check event location.
   event->x += touchpad_gesture_target_.delta.x();
   event->y += touchpad_gesture_target_.delta.y();
   touchpad_gesture_target_.target->ProcessGestureEvent(*event, latency);
 }
 
 }  // namespace content