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

Unified Diff: content/common/input/input_param_traits_unittest.cc

Issue 293683002: Synthetic pinch gesture take scale factor as parameter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
Index: content/common/input/input_param_traits_unittest.cc
diff --git a/content/common/input/input_param_traits_unittest.cc b/content/common/input/input_param_traits_unittest.cc
index 8be679e1600b3fc18c9a3bf26380487e60f5aa16..db07d29dc5c14beec457568206ff5ef8a438a9b8 100644
--- a/content/common/input/input_param_traits_unittest.cc
+++ b/content/common/input/input_param_traits_unittest.cc
@@ -51,8 +51,7 @@ class InputParamTraitsTest : public testing::Test {
static void Compare(const SyntheticPinchGestureParams* a,
const SyntheticPinchGestureParams* b) {
EXPECT_EQ(a->gesture_source_type, b->gesture_source_type);
- EXPECT_EQ(a->zoom_in, b->zoom_in);
- EXPECT_EQ(a->total_num_pixels_covered, b->total_num_pixels_covered);
+ EXPECT_EQ(a->scale_factor, b->scale_factor);
EXPECT_EQ(a->anchor, b->anchor);
EXPECT_EQ(a->relative_pointer_speed_in_pixels_s,
b->relative_pointer_speed_in_pixels_s);
@@ -209,8 +208,7 @@ TEST_F(InputParamTraitsTest, SyntheticPinchGestureParams) {
scoped_ptr<SyntheticPinchGestureParams> gesture_params(
new SyntheticPinchGestureParams);
gesture_params->gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
- gesture_params->zoom_in = true;
- gesture_params->total_num_pixels_covered = 123;
+ gesture_params->scale_factor = 2.3f;
gesture_params->anchor.SetPoint(234, 345);
gesture_params->relative_pointer_speed_in_pixels_s = 456;
ASSERT_EQ(SyntheticGestureParams::PINCH_GESTURE,

Powered by Google App Engine
This is Rietveld 408576698