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

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 2227803003: Plumb phase/momentum for WheelEvent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Non-Mac compile. Created 4 years, 4 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_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index adc93fa634f9c05bb268f9854f7223026df5a19a..5767991dae77ef6d268f43901fee055419c7f964 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -2175,11 +2175,8 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
if (renderWidgetHostView_->render_widget_host_) {
// History-swiping is not possible if the logic reaches this point.
- // Allow rubber-banding in both directions.
- bool canRubberbandLeft = true;
- bool canRubberbandRight = true;
WebMouseWheelEvent webEvent = WebMouseWheelEventBuilder::Build(
- event, self, canRubberbandLeft, canRubberbandRight);
+ event, self);
webEvent.railsMode = mouseWheelFilter_.UpdateRailsMode(webEvent);
ui::LatencyInfo latency_info;
latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
@@ -2350,10 +2347,7 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
// This is responsible for content scrolling!
if (renderWidgetHostView_->render_widget_host_) {
- BOOL canRubberbandLeft = [responderDelegate_ canRubberbandLeft:self];
- BOOL canRubberbandRight = [responderDelegate_ canRubberbandRight:self];
- WebMouseWheelEvent webEvent = WebMouseWheelEventBuilder::Build(
- event, self, canRubberbandLeft, canRubberbandRight);
+ WebMouseWheelEvent webEvent = WebMouseWheelEventBuilder::Build(event, self);
webEvent.railsMode = mouseWheelFilter_.UpdateRailsMode(webEvent);
if (renderWidgetHostView_->ShouldRouteEvent(webEvent)) {
renderWidgetHostView_->render_widget_host_->delegate()

Powered by Google App Engine
This is Rietveld 408576698