chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm - Issue 821173003: Fix Magic Mouse history swiping bug.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm

Issue 821173003: Fix Magic Mouse history swiping bug. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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

« no previous file with comments | « chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.h ('k') | chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm » ('j') | chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm

diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm

index 1d3be093c79539a9078005b550536715c30e3257..2f72c34971a81357946741d61d684020d56519db 100644

--- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm

+++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm

@@ -163,6 +163,9 @@ BOOL forceMagicMouse = NO;

- (void)beginGestureWithEvent:(NSEvent*)event {

inGesture_ = YES;

+ // Reset state pertaining to Magic Mouse swipe gestures.

+ mouseScrollDelta_ = NSZeroSize;

}

- (void)endGestureWithEvent:(NSEvent*)event {

@@ -213,10 +216,9 @@ BOOL forceMagicMouse = NO;

- (void)touchesBeganWithEvent:(NSEvent*)event {

receivingTouches_ = YES;

- // Reset state pertaining to previous gestures.

+ // Reset state pertaining to previous trackpad gestures.

gestureStartPointValid_ = NO;

gestureTotalY_ = 0;

- mouseScrollDelta_ = NSZeroSize;

beganEventUnconsumed_ = NO;

recognitionState_ = history_swiper::kPending;

}