Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1301)

Unified Diff: content/browser/renderer_host/input/input_router_impl.h

Issue 660663002: Clear pending events upon main frame navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updates Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/input/input_router_impl.h
diff --git a/content/browser/renderer_host/input/input_router_impl.h b/content/browser/renderer_host/input/input_router_impl.h
index 2b00c12996f3c5af280812bebed24ef1643c26bf..5916365aa4097913177e260afd21a35b4047dfe3 100644
--- a/content/browser/renderer_host/input/input_router_impl.h
+++ b/content/browser/renderer_host/input/input_router_impl.h
@@ -56,7 +56,6 @@ class CONTENT_EXPORT InputRouterImpl
~InputRouterImpl() override;
// InputRouter
- void Flush() override;
bool SendInput(scoped_ptr<IPC::Message> message) override;
void SendMouseEvent(const MouseEventWithLatencyInfo& mouse_event) override;
void SendWheelEvent(
@@ -67,6 +66,7 @@ class CONTENT_EXPORT InputRouterImpl
void SendGestureEvent(
const GestureEventWithLatencyInfo& gesture_event) override;
void SendTouchEvent(const TouchEventWithLatencyInfo& touch_event) override;
+ void RequestFlushedNotification() override;
const NativeWebKeyboardEvent* GetLastKeyboardEvent() const override;
bool ShouldForwardTouchEvent() const override;
void OnViewUpdated(int view_flags) override;
@@ -269,6 +269,11 @@ private:
// to the client_ after all events have been dispatched/acked.
bool flush_requested_;
+ // Whether we're in the scope of destruction. The only input events that might
+ // conceivably arrive when this is true are gesture events generated from
+ // flushing |touch_event_queue_|, which will be summarily dropped.
+ bool in_shutdown_;
+
TouchEventQueue touch_event_queue_;
GestureEventQueue gesture_event_queue_;
TouchActionFilter touch_action_filter_;
« no previous file with comments | « content/browser/renderer_host/input/input_router_client.h ('k') | content/browser/renderer_host/input/input_router_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698