1 files changed, 20 insertions, 22 deletions

diff --git a/chromium/content/common/input/synthetic_web_input_event_builders.h b/chromium/content/common/input/synthetic_web_input_event_builders.h
index b52dc4122f2..f16830d2cba 100644
--- a/chromium/content/common/input/synthetic_web_input_event_builders.h
+++ b/chromium/content/common/input/synthetic_web_input_event_builders.h
@@ -17,9 +17,9 @@ class CONTENT_EXPORT SyntheticWebMouseEventBuilder {
  public:
   static blink::WebMouseEvent Build(blink::WebInputEvent::Type type);
   static blink::WebMouseEvent Build(blink::WebInputEvent::Type type,
-                                     int window_x,
-                                     int window_y,
-                                     int modifiers);
+                                    int window_x,
+                                    int window_y,
+                                    int modifiers);
 };
 
 class CONTENT_EXPORT SyntheticWebMouseWheelEventBuilder {
@@ -27,9 +27,9 @@ class CONTENT_EXPORT SyntheticWebMouseWheelEventBuilder {
   static blink::WebMouseWheelEvent Build(
       blink::WebMouseWheelEvent::Phase phase);
   static blink::WebMouseWheelEvent Build(float dx,
-                                          float dy,
-                                          int modifiers,
-                                          bool precise);
+                                         float dy,
+                                         int modifiers,
+                                         bool precise);
 };
 
 class CONTENT_EXPORT SyntheticWebKeyboardEventBuilder {
@@ -39,20 +39,23 @@ class CONTENT_EXPORT SyntheticWebKeyboardEventBuilder {
 
 class CONTENT_EXPORT SyntheticWebGestureEventBuilder {
  public:
-  static blink::WebGestureEvent Build(
-      blink::WebInputEvent::Type type,
-      blink::WebGestureEvent::SourceDevice sourceDevice);
+  static blink::WebGestureEvent Build(blink::WebInputEvent::Type type,
+                                      blink::WebGestureDevice source_device);
+  static blink::WebGestureEvent BuildScrollBegin(float dx_hint,
+                                                 float dy_hint);
   static blink::WebGestureEvent BuildScrollUpdate(float dx,
-                                                   float dY,
-                                                   int modifiers);
-  static blink::WebGestureEvent BuildPinchUpdate(float scale,
-                                                  float anchor_x,
-                                                  float anchor_y,
+                                                  float dy,
                                                   int modifiers);
+  static blink::WebGestureEvent BuildPinchUpdate(
+      float scale,
+      float anchor_x,
+      float anchor_y,
+      int modifiers,
+      blink::WebGestureDevice source_device);
   static blink::WebGestureEvent BuildFling(
       float velocity_x,
       float velocity_y,
-      blink::WebGestureEvent::SourceDevice source_device);
+      blink::WebGestureDevice source_device);
 };
 
 class CONTENT_EXPORT SyntheticWebTouchEvent
@@ -64,19 +67,14 @@ class CONTENT_EXPORT SyntheticWebTouchEvent
   void ResetPoints();
 
   // Adds an additional point to the touch list, returning the point's index.
-  int PressPoint(int x, int y);
-  void MovePoint(int index, int x, int y);
+  int PressPoint(float x, float y);
+  void MovePoint(int index, float x, float y);
   void ReleasePoint(int index);
   void CancelPoint(int index);
 
   void SetTimestamp(base::TimeDelta timestamp);
 };
 
-class CONTENT_EXPORT SyntheticWebTouchEventBuilder {
- public:
-  static SyntheticWebTouchEvent Build(blink::WebInputEvent::Type type);
-};
-
 }  // namespace content
 
 #endif  // CONTENT_COMMON_INPUT_SYNTHETIC_WEB_INPUT_EVENT_BUILDERS_H_