Handle pointer-events: none in browser process hittesting.

content/browser/renderer_host/render_widget_host_input_event_router.cc

Index: content/browser/renderer_host/render_widget_host_input_event_router.cc
diff --git a/content/browser/renderer_host/render_widget_host_input_event_router.cc b/content/browser/renderer_host/render_widget_host_input_event_router.cc
index eef72ac2c73932a4a747448eea88bbbdf39e0f74..a75c14f2910ae7e686eddc20cdd36b6bd4932f4d 100644
--- a/content/browser/renderer_host/render_widget_host_input_event_router.cc
+++ b/content/browser/renderer_host/render_widget_host_input_event_router.cc
@@ -4,12 +4,28 @@
 
 #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
 
+#include "cc/quads/surface_draw_quad.h"
+#include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "content/common/frame_messages.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 namespace content {
 
+RenderWidgetHostInputEventRouter::HittestDelegate::HittestDelegate(
+    const std::unordered_map<cc::SurfaceId, HittestData>& hittest_data)
+    : hittest_data_(hittest_data) {}
+
+bool RenderWidgetHostInputEventRouter::HittestDelegate::RejectHitTarget(
+    const cc::SurfaceDrawQuad* surface_quad,
+    const gfx::Point& point_in_quad_space) {
+  auto it = hittest_data_.find(surface_quad->surface_id);
+  if (it != hittest_data_.end() && it->second.ignored_for_hittest_)
+    return true;
+  return false;
+}
+
 RenderWidgetHostInputEventRouter::RenderWidgetHostInputEventRouter()
     : active_touches_(0) {}
 
@@ -28,12 +44,16 @@ RenderWidgetHostViewBase* RenderWidgetHostInputEventRouter::FindEventTarget(
     return root_view;
   }
 
+  // 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_id_namespace =
-      root_view->SurfaceIdNamespaceAtPoint(point, transformed_point);
+      root_view->SurfaceIdNamespaceAtPoint(&delegate, point, transformed_point);
   const SurfaceIdNamespaceOwnerMap::iterator iter =
       owner_map_.find(surface_id_namespace);
   // If the point hit a Surface whose namspace is no longer in the map, then
@@ -134,6 +154,27 @@ void RenderWidgetHostInputEventRouter::AddSurfaceIdNamespaceOwner(
 void RenderWidgetHostInputEventRouter::RemoveSurfaceIdNamespaceOwner(
     uint32_t id) {
   owner_map_.erase(id);
+
+  for (auto it = hittest_data_.begin(); it != hittest_data_.end();) {
+    if (cc::SurfaceIdAllocator::NamespaceForId(it->first) == id)
+      it = hittest_data_.erase(it);
+    else
+      ++it;
+  }
+}
+
+void RenderWidgetHostInputEventRouter::OnHittestData(
+    const FrameHostMsg_HittestData_Params& params) {
+  DCHECK(owner_map_.find(cc::SurfaceIdAllocator::NamespaceForId(
+             params.surface_id)) != owner_map_.end());
+  HittestData data;
+  data.ignored_for_hittest_ = params.ignored_for_hittest;
+  auto it = hittest_data_.find(params.surface_id);
+  if (it == hittest_data_.end())

[piman, 2016/01/16 01:25:36]

nit: needs {} per style (both branches).

[lfg, 2016/01/18 21:35:20]

I went with the suggestion below.

+    hittest_data_.insert(
+        std::pair<cc::SurfaceId, HittestData>(params.surface_id, data));
+  else
+    it->second = data;

[piman, 2016/01/16 01:25:36]

nit: hittest_data_[params.surface_id] = data; may just be as good as all of this
- single lookup, and very concise.

Other possibility, if you want to avoid the default constructor + copy, you can
insert unconditionally, and if returns (iterator, false), assign using the
iterator:
auto it_and_result = hittest_data_.insert(params.surface_id, data);
if (!it_and_result.second)
  *(it_and_result.first) = data;

[lfg, 2016/01/18 21:35:20]

Done.

 }
 
 }  // namespace content