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

Unified Diff: content/browser/renderer_host/render_widget_host_view_event_handler.h

Issue 2914393002: Adding phase info to wheel events migrated to wheel phase handler class. (Closed)
Patch Set: fixed mouse_wheel_phase_handler_path in rwhv_mac Created 3 years, 6 months 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/render_widget_host_view_event_handler.h
diff --git a/content/browser/renderer_host/render_widget_host_view_event_handler.h b/content/browser/renderer_host/render_widget_host_view_event_handler.h
index c0bdfce4df3d7ada7472893144c3180bf0fe650f..24815cc76da580b5a5fbb60564f078fce6eb45e5 100644
--- a/content/browser/renderer_host/render_widget_host_view_event_handler.h
+++ b/content/browser/renderer_host/render_widget_host_view_event_handler.h
@@ -8,7 +8,7 @@
#include <memory>
#include "base/macros.h"
-#include "base/timer/timer.h"
+#include "content/browser/renderer_host/input/mouse_wheel_phase_handler.h"
#include "content/common/content_export.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "ui/aura/window_tracker.h"
@@ -189,11 +189,6 @@ class CONTENT_EXPORT RenderWidgetHostViewEventHandler
const ui::LatencyInfo& latency);
void ProcessTouchEvent(const blink::WebTouchEvent& event,
const ui::LatencyInfo& latency);
- void SendSyntheticWheelEventWithPhaseEnded(
- blink::WebMouseWheelEvent last_mouse_wheel_event,
- bool should_route_event);
- void AddPhaseAndScheduleEndEvent(blink::WebMouseWheelEvent& mouse_wheel_event,
- bool should_route_event);
// Whether return characters should be passed on to the RenderWidgetHostImpl.
bool accept_return_character_;
@@ -255,8 +250,7 @@ class CONTENT_EXPORT RenderWidgetHostViewEventHandler
ui::EventHandler* popup_child_event_handler_;
Delegate* const delegate_;
aura::Window* window_;
-
- base::OneShotTimer mouse_wheel_end_dispatch_timer_;
+ MouseWheelPhaseHandler mouse_wheel_phase_handler_;
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewEventHandler);
};

Powered by Google App Engine
This is Rietveld 408576698