Revert of Handle pointer-events: none in browser process hittesting.

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 "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, cc::SurfaceIdHash>&
-        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) {}
 
 RenderWidgetHostInputEventRouter::~RenderWidgetHostInputEventRouter() {
   owner_map_.clear();
 }
 
 RenderWidgetHostViewBase* RenderWidgetHostInputEventRouter::FindEventTarget(
     RenderWidgetHostViewBase* root_view,
     const gfx::Point& point,
     gfx::Point* transformed_point) {
   // Short circuit if owner_map has only one RenderWidgetHostView, no need for
   // hit testing.
   if (owner_map_.size() <= 1) {
     *transformed_point = point;
     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(&delegate, point, transformed_point);
+      root_view->SurfaceIdNamespaceAtPoint(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
   // 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;
   RenderWidgetHostViewBase* target = iter->second.get();
   // If we find the weak pointer is now null, it means the map entry is stale
   // and should be removed to free space.
@@ skipping 80 matching lines @@
 void RenderWidgetHostInputEventRouter::AddSurfaceIdNamespaceOwner(
     uint32_t id,
     RenderWidgetHostViewBase* owner) {
   DCHECK(owner_map_.find(id) == owner_map_.end());
   owner_map_.insert(std::make_pair(id, owner->GetWeakPtr()));
 }
 
 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) {
-  if (owner_map_.find(cc::SurfaceIdAllocator::NamespaceForId(
-          params.surface_id)) == owner_map_.end()) {
-    return;
-  }
-  HittestData data;
-  data.ignored_for_hittest = params.ignored_for_hittest;
-  hittest_data_[params.surface_id] = data;
 }
 
 }  // namespace content