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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 1127013002: Make Mac pinch thresholding apply only to zoom (Blink side) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.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
« no previous file with comments | « no previous file | public/web/WebInputEvent.h » ('j') | public/web/WebInputEvent.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 537ec2ece4d68f730694ef892c1ef33659abae53..eaa9883b235c495dfb481941c4d887a4dcc32097 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -2183,6 +2183,9 @@ bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent)
if (handleSyntheticWheelFromTouchpadPinchEvent(pinchEvent))
return true;
+ if (pinchEvent.data.pinchUpdate.zoomDisabled)
+ return false;
ccameron 2015/05/06 03:48:32 Testing for this requires event sender support fro
+
if (page()->frameHost().pinchViewport().magnifyScaleAroundAnchor(pinchEvent.data.pinchUpdate.scale, FloatPoint(pinchEvent.x, pinchEvent.y)))
return true;
}
« no previous file with comments | « no previous file | public/web/WebInputEvent.h » ('j') | public/web/WebInputEvent.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698