Revert of Added EventSender.setTouchPointRadius() for layoutTests

content/shell/renderer/test_runner/event_sender.cc

 // Copyright 2014 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/shell/renderer/test_runner/event_sender.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 365 matching lines @@
   void TextZoomOut();
   void ZoomPageIn();
   void ZoomPageOut();
   void SetPageZoomFactor(double factor);
   void SetPageScaleFactor(gin::Arguments* args);
   void SetPageScaleFactorLimits(gin::Arguments* args);
   void ClearTouchPoints();
   void ReleaseTouchPoint(unsigned index);
   void UpdateTouchPoint(unsigned index, double x, double y);
   void CancelTouchPoint(unsigned index);
-  void SetTouchPointRadius(unsigned index,
-                           float rx,
-                           float ry,
-                           bool set_state_moved);
   void SetTouchModifier(const std::string& key_name, bool set_mask);
   void SetTouchCancelable(bool cancelable);
   void DumpFilenameBeingDragged();
   void GestureFlingCancel();
   void GestureFlingStart(float x,
                          float y,
                          float velocity_x,
                          float velocity_y,
                          gin::Arguments* args);
   void GestureScrollFirstPoint(int x, int y);
@@ skipping 115 matching lines @@
       .SetMethod("zoomPageIn", &EventSenderBindings::ZoomPageIn)
       .SetMethod("zoomPageOut", &EventSenderBindings::ZoomPageOut)
       .SetMethod("setPageZoomFactor", &EventSenderBindings::SetPageZoomFactor)
       .SetMethod("setPageScaleFactor", &EventSenderBindings::SetPageScaleFactor)
       .SetMethod("setPageScaleFactorLimits",
                  &EventSenderBindings::SetPageScaleFactorLimits)
       .SetMethod("clearTouchPoints", &EventSenderBindings::ClearTouchPoints)
       .SetMethod("releaseTouchPoint", &EventSenderBindings::ReleaseTouchPoint)
       .SetMethod("updateTouchPoint", &EventSenderBindings::UpdateTouchPoint)
       .SetMethod("cancelTouchPoint", &EventSenderBindings::CancelTouchPoint)
-      .SetMethod("setTouchPointRadius",
-                 &EventSenderBindings::SetTouchPointRadius)
       .SetMethod("setTouchModifier", &EventSenderBindings::SetTouchModifier)
       .SetMethod("setTouchCancelable", &EventSenderBindings::SetTouchCancelable)
       .SetMethod("dumpFilenameBeingDragged",
                  &EventSenderBindings::DumpFilenameBeingDragged)
       .SetMethod("gestureFlingCancel", &EventSenderBindings::GestureFlingCancel)
       .SetMethod("gestureFlingStart", &EventSenderBindings::GestureFlingStart)
       .SetMethod("gestureScrollFirstPoint",
                  &EventSenderBindings::GestureScrollFirstPoint)
       .SetMethod("touchStart", &EventSenderBindings::TouchStart)
       .SetMethod("touchMove", &EventSenderBindings::TouchMove)
@@ skipping 169 matching lines @@
 void EventSenderBindings::UpdateTouchPoint(unsigned index, double x, double y) {
   if (sender_)
     sender_->UpdateTouchPoint(index, static_cast<float>(x), static_cast<float>(y));
 }
 
 void EventSenderBindings::CancelTouchPoint(unsigned index) {
   if (sender_)
     sender_->CancelTouchPoint(index);
 }
 
-void EventSenderBindings::SetTouchPointRadius(unsigned index,
-                                              float rx,
-                                              float ry,
-                                              bool set_state_moved) {
-  if (sender_)
-    sender_->SetTouchPointRadius(index, rx, ry, set_state_moved);
-}
-
 void EventSenderBindings::SetTouchModifier(const std::string& key_name,
                                            bool set_mask) {
   if (sender_)
     sender_->SetTouchModifier(key_name, set_mask);
 }
 
 void EventSenderBindings::SetTouchCancelable(bool cancelable) {
   if (sender_)
     sender_->SetTouchCancelable(cancelable);
 }
@@ skipping 884 matching lines @@
 void EventSender::CancelTouchPoint(unsigned index) {
   if (index >= touch_points_.size()) {
     ThrowTouchPointError();
     return;
   }
 
   WebTouchPoint* touch_point = &touch_points_[index];
   touch_point->state = WebTouchPoint::StateCancelled;
 }
 
-void EventSender::SetTouchPointRadius(unsigned index,
-                                      float rx,
-                                      float ry,
-                                      bool set_state_moved) {
-  if (index >= touch_points_.size()) {
-    ThrowTouchPointError();
-    return;
-  }
-
-  WebTouchPoint* touch_point = &touch_points_[index];
-  if (set_state_moved)
-    touch_point->state = WebTouchPoint::StateMoved;
-  touch_point->radiusX = rx;
-  touch_point->radiusY = ry;
-}
-
 void EventSender::SetTouchModifier(const std::string& key_name,
                                     bool set_mask) {
   int mask = 0;
   if (key_name == "shift")
     mask = WebInputEvent::ShiftKey;
   else if (key_name == "alt")
     mask = WebInputEvent::AltKey;
   else if (key_name == "ctrl")
     mask = WebInputEvent::ControlKey;
   else if (key_name == "meta")
@@ skipping 139 matching lines @@
     args->ThrowError();
     return;
   }
 
   WebTouchPoint touch_point;
   touch_point.state = WebTouchPoint::StatePressed;
   touch_point.position = WebFloatPoint(static_cast<float>(x),
                                        static_cast<float>(y));
   touch_point.screenPosition = touch_point.position;
 
+  if (!args->PeekNext().IsEmpty()) {
+    double radius_x;
+    if (!args->GetNext(&radius_x)) {
+      args->ThrowError();
+      return;
+    }
+
+    double radius_y = radius_x;
+    if (!args->PeekNext().IsEmpty()) {
+      if (!args->GetNext(&radius_y)) {
+        args->ThrowError();
+        return;
+      }
+    }
+
+    touch_point.radiusX = static_cast<float>(radius_x);
+    touch_point.radiusY = static_cast<float>(radius_y);
+  }
+
   int lowest_id = 0;
   for (size_t i = 0; i < touch_points_.size(); i++) {
     if (touch_points_[i].id == lowest_id)
       lowest_id++;
   }
   touch_point.id = lowest_id;
   touch_points_.push_back(touch_point);
 }
 
 void EventSender::MouseDragBegin() {
@@ skipping 702 matching lines @@
 
 bool EventSender::HandleInputEventOnViewOrPopup(const WebInputEvent& event) {
   if (WebPagePopup* popup = view_->pagePopup()) {
     if (!WebInputEvent::isKeyboardEventType(event.type))
       return popup->handleInputEvent(event);
   }
   return view_->handleInputEvent(event);
 }
 
 }  // namespace content