chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm - Issue 117733002: mac: Fix a newly introduced 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 117733002: mac: Fix a newly introduced history swiping bug. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add a forward declaration. Created 7 years 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 | « base/mac/sdk_forward_declarations.h ('k') | chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm » ('j') | no next file with comments »
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 306ff08451f7509eb86b171e6811e5965c33ea98..8d155990fabf9050a13eee2c173e97edea13a407 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

@@ -280,9 +280,18 @@

- (BOOL)maybeHandleHistorySwiping:(NSEvent*)theEvent {

// We've already processed this gesture.

if (lastProcessedGestureId_ == currentGestureId_) {

+ // A new event may come in before it's recognized as a gesture.

+ // We have not yet reset the state from the last gesture.

+ // Let it pass through.

+ if ([theEvent phase] == NSEventPhaseBegan ||

+ [theEvent phase] == NSEventPhaseMayBegin) {

+ return NO;

+ }

// The user cancelled the history swiper. Ignore all events.

if (historySwipeCancelled_)

return NO;

// The user completed the history swiper. Swallow all events.

return YES;

}