Chromium Code Reviews| 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 03902f5b3d1939568d3f5992245d5bf7c02a6e76..d72a5f5e9e3e6d04823ceb166663aa05f67344fb 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 |
| @@ -6,12 +6,17 @@ |
| #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_INPUT_EVENT_ROUTER_H_ |
| #include <stdint.h> |
| +#include <unordered_map> |
| #include "base/containers/hash_tables.h" |
| #include "base/macros.h" |
| #include "base/memory/weak_ptr.h" |
| +#include "cc/surfaces/surface_hittest_delegate.h" |
| +#include "cc/surfaces/surface_id.h" |
| #include "content/common/content_export.h" |
| +struct FrameHostMsg_HittestData_Params; |
| + |
| namespace blink { |
| class WebMouseEvent; |
| class WebMouseWheelEvent; |
| @@ -56,7 +61,23 @@ class CONTENT_EXPORT RenderWidgetHostInputEventRouter { |
| return owner_map_.find(id) != owner_map_.end(); |
| } |
| + void OnHittestData(const FrameHostMsg_HittestData_Params& params); |
| + |
| private: |
| + struct HittestData { |
| + bool ignored_for_hittest_; |
|
piman
2016/01/16 01:25:36
nit: style for public struct members is without a
lfg
2016/01/18 21:35:20
Done.
|
| + }; |
| + |
| + class HittestDelegate : public cc::SurfaceHittestDelegate { |
| + public: |
| + HittestDelegate( |
| + const std::unordered_map<cc::SurfaceId, HittestData>& hittest_data); |
| + bool RejectHitTarget(const cc::SurfaceDrawQuad* surface_quad, |
| + const gfx::Point& point_in_quad_space) override; |
| + |
| + const std::unordered_map<cc::SurfaceId, HittestData>& hittest_data_; |
| + }; |
| + |
| using WeakTarget = base::WeakPtr<RenderWidgetHostViewBase>; |
| using SurfaceIdNamespaceOwnerMap = |
| base::hash_map<uint32_t, base::WeakPtr<RenderWidgetHostViewBase>>; |
| @@ -68,6 +89,7 @@ class CONTENT_EXPORT RenderWidgetHostInputEventRouter { |
| SurfaceIdNamespaceOwnerMap owner_map_; |
| WeakTarget current_touch_target_; |
| int active_touches_; |
| + std::unordered_map<cc::SurfaceId, HittestData> hittest_data_; |
| DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostInputEventRouter); |
| }; |