content/renderer/input/input_handler_proxy.cc - Issue 1129693002: Make Mac pinch thresholding apply only to zoom (Chromium side)

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: content/renderer/input/input_handler_proxy.cc

Issue 1129693002: Make Mac pinch thresholding apply only to zoom (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« content/browser/renderer_host/render_widget_host_view_mac.mm ('K') | « content/browser/renderer_host/render_widget_host_view_mac_unittest.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/input/input_handler_proxy.cc

diff --git a/content/renderer/input/input_handler_proxy.cc b/content/renderer/input/input_handler_proxy.cc

index f714ef1f3d956678b8ba0b3cd744f85715a142a7..ca57c5fbe3e344568d1f362a38a28ba058ac72ee 100644

--- a/content/renderer/input/input_handler_proxy.cc

+++ b/content/renderer/input/input_handler_proxy.cc

@@ -280,6 +280,8 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleInputEvent(

if (gesture_pinch_on_impl_thread_) {

const WebGestureEvent& gesture_event =

static_cast<const WebGestureEvent&>(event);

+ if (gesture_event.data.pinchUpdate.zoomDisabled)

+ return DID_HANDLE;

jdduke (slow) 2015/05/07 01:53:50 What about DROP_EVENT? Should have a similar effec

ccameron 2015/05/07 17:09:06 Sure -- updated. I was originally thinking DROP, b

input_handler_->PinchGestureUpdate(

gesture_event.data.pinchUpdate.scale,

gfx::Point(gesture_event.x, gesture_event.y));