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

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

Issue 1848063002: Fix page navigation being incorrectly fired on Mac OSX. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.h
diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.h b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.h
index 47fe073dff18a04bfcb37d393927d68358ae04a4..538fbd7f00196851b1e51110ef7c2f4d1952fbf4 100644
--- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.h
+++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.h
@@ -8,6 +8,7 @@
#import <Cocoa/Cocoa.h>
namespace blink {
+class WebGestureEvent;
class WebMouseWheelEvent;
}
@@ -155,7 +156,8 @@ enum RecognitionState {
// Whether the event with phase NSEventPhaseBegan was not consumed by the
// renderer. This variables defaults to NO for new gestures.
erikchen 2016/04/01 03:44:56 This comment applies to the previous ivar, which I
erikchen 2016/04/01 16:18:58 Please add your explanation here, as well as updat
dtapuska 2016/04/01 17:22:25 The logic is about the first gesture scroll after
erikchen 2016/04/01 17:57:34 I'm sorry, but I don't understand your explanation
dtapuska 2016/04/01 19:00:25 Done.
- BOOL beganEventUnconsumed_;
+ BOOL firstScrollUnconsumed_;
+ BOOL nextScrollUpdatesUnconsumed_;
history_swiper::RecognitionState recognitionState_;
id<HistorySwiperDelegate> delegate_;
@@ -171,6 +173,8 @@ enum RecognitionState {
- (BOOL)handleEvent:(NSEvent*)event;
- (void)rendererHandledWheelEvent:(const blink::WebMouseWheelEvent&)event
consumed:(BOOL)consumed;
+- (void)rendererHandledGestureScrollEvent:(const blink::WebGestureEvent&)event
+ consumed:(BOOL)consumed;
// The event passed in is a gesture event, and has touch data associated with
// the trackpad.

Powered by Google App Engine
This is Rietveld 408576698