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 54a10cfcf58c41f7334c880996855bbb6fcff13f..552334b8ef1149ce4e092c134c324430ad687ddf 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 |
@@ -8,6 +8,7 @@ |
#include <stdint.h> |
#include "base/containers/hash_tables.h" |
+#include "base/memory/weak_ptr.h" |
#include "content/common/content_export.h" |
namespace blink { |
@@ -55,14 +56,16 @@ class CONTENT_EXPORT RenderWidgetHostInputEventRouter { |
} |
private: |
- RenderWidgetHostViewBase* FindEventTarget(RenderWidgetHostViewBase* root_view, |
- const gfx::Point& point, |
- gfx::Point* transformed_point); |
+ using WeakTarget = base::WeakPtr<RenderWidgetHostViewBase>; |
+ using SurfaceIdNamespaceOwnerMap = base::hash_map<uint32_t, WeakTarget>; |
+ |
+ WeakTarget FindEventTarget(RenderWidgetHostViewBase* root_view, |
+ const gfx::Point& point, |
+ gfx::Point* transformed_point); |
- typedef base::hash_map<uint32_t, RenderWidgetHostViewBase*> |
- SurfaceIdNamespaceOwnerMap; |
SurfaceIdNamespaceOwnerMap owner_map_; |
- RenderWidgetHostViewBase* current_touch_target_; |
+ bool has_current_touch_target_; |
+ WeakTarget current_touch_target_; |
int active_touches_; |
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostInputEventRouter); |