Synthetic pinch gesture take scale factor as parameter.

content/common/input/input_param_traits_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/input/input_param_traits.h"
 
 #include "content/common/input/input_event.h"
 #include "content/common/input/synthetic_gesture_params.h"
 #include "content/common/input/synthetic_pinch_gesture_params.h"
 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
@@ skipping 33 matching lines @@
     EXPECT_EQ(a->distances.size(), b->distances.size());
     for (size_t i = 0; i < a->distances.size(); i++)
         EXPECT_EQ(a->distances[i], b->distances[i]);
     EXPECT_EQ(a->prevent_fling, b->prevent_fling);
     EXPECT_EQ(a->speed_in_pixels_s, b->speed_in_pixels_s);
   }
 
   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);
   }
 
   static void Compare(const SyntheticTapGestureParams* a,
                       const SyntheticTapGestureParams* b) {
     EXPECT_EQ(a->gesture_source_type, b->gesture_source_type);
     EXPECT_EQ(a->position, b->position);
     EXPECT_EQ(a->duration_ms, b->duration_ms);
@@ skipping 136 matching lines @@
   SyntheticGesturePacket packet_in;
   packet_in.set_gesture_params(gesture_params.PassAs<SyntheticGestureParams>());
 
   Verify(packet_in);
 }
 
 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,
             gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
   packet_in.set_gesture_params(gesture_params.PassAs<SyntheticGestureParams>());
 
   Verify(packet_in);
 }
 
 TEST_F(InputParamTraitsTest, SyntheticTapGestureParams) {
   scoped_ptr<SyntheticTapGestureParams> gesture_params(
       new SyntheticTapGestureParams);
   gesture_params->gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
   gesture_params->position.SetPoint(798, 233);
   gesture_params->duration_ms = 13;
   ASSERT_EQ(SyntheticGestureParams::TAP_GESTURE,
             gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
   packet_in.set_gesture_params(gesture_params.PassAs<SyntheticGestureParams>());
 
   Verify(packet_in);
 }
 
 }  // namespace
 }  // namespace content