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

Unified Diff: content/renderer/input/input_handler_proxy_unittest.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: Fix compile 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 | « content/renderer/input/input_handler_proxy.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/input/input_handler_proxy_unittest.cc
diff --git a/content/renderer/input/input_handler_proxy_unittest.cc b/content/renderer/input/input_handler_proxy_unittest.cc
index 7994914e0b3aa4da902a0fe40daf695c395e8e92..a72114c337cb62b5d1d12c779290b72017a021d6 100644
--- a/content/renderer/input/input_handler_proxy_unittest.cc
+++ b/content/renderer/input/input_handler_proxy_unittest.cc
@@ -415,6 +415,17 @@ TEST_F(InputHandlerProxyTest, GesturePinch) {
gesture_.type = WebInputEvent::GesturePinchUpdate;
gesture_.data.pinchUpdate.scale = 0.5;
+ gesture_.data.pinchUpdate.zoomDisabled = true;
+ gesture_.x = 9;
+ gesture_.y = 6;
+ EXPECT_EQ(InputHandlerProxy::DROP_EVENT,
+ input_handler_->HandleInputEvent(gesture_));
+ gesture_.data.pinchUpdate.zoomDisabled = false;
+
+ VERIFY_AND_RESET_MOCKS();
+
+ gesture_.type = WebInputEvent::GesturePinchUpdate;
+ gesture_.data.pinchUpdate.scale = 0.5;
gesture_.x = 9;
gesture_.y = 6;
EXPECT_CALL(mock_input_handler_, PinchGestureUpdate(.5, gfx::Point(9, 6)));
« no previous file with comments | « content/renderer/input/input_handler_proxy.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698