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

Unified Diff: content/browser/web_contents/web_contents_impl_unittest.cc

Issue 255843004: Update trackpad pinch-zoom code for corrected scale semantics (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/browser/web_contents/web_contents_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl_unittest.cc
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index 3d607c28c1428e3d7a8b8b3f0a23d61a16383387..d49fcec850756b382832b779ae4ec9f542c6f352 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -2499,7 +2499,7 @@ TEST_F(WebContentsImplTest, HandleGestureEvent) {
WebInputEvent::GesturePinchUpdate, WebGestureEvent::Touchpad);
// A pinch less than the step value doesn't change the zoom level.
- event.data.pinchUpdate.scale = kZoomStepValue * 0.8f;
+ event.data.pinchUpdate.scale = 1.0f + kZoomStepValue * 0.8f;
EXPECT_TRUE(contents()->HandleGestureEvent(event));
EXPECT_EQ(0, delegate->GetAndResetContentsZoomChangedCallCount());
@@ -2509,7 +2509,7 @@ TEST_F(WebContentsImplTest, HandleGestureEvent) {
EXPECT_TRUE(delegate->last_zoom_in());
// Pinching back out one step goes back to 100%.
- event.data.pinchUpdate.scale = -kZoomStepValue;
+ event.data.pinchUpdate.scale = 1.0f - kZoomStepValue;
EXPECT_TRUE(contents()->HandleGestureEvent(event));
EXPECT_EQ(1, delegate->GetAndResetContentsZoomChangedCallCount());
EXPECT_FALSE(delegate->last_zoom_in());
@@ -2527,7 +2527,7 @@ TEST_F(WebContentsImplTest, HandleGestureEvent) {
// a touchscreen pinch gesture).
event = SyntheticWebGestureEventBuilder::Build(
WebInputEvent::GesturePinchUpdate, WebGestureEvent::Touchscreen);
- event.data.pinchUpdate.scale = kZoomStepValue * 3;
+ event.data.pinchUpdate.scale = 1.0f + kZoomStepValue * 3;
EXPECT_FALSE(contents()->HandleGestureEvent(event));
EXPECT_EQ(0, delegate->GetAndResetContentsZoomChangedCallCount());
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698