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

Unified Diff: content/shell/renderer/test_runner/event_sender.cc

Issue 600733002: Revert of EventSender: Added checks for missing arguments (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/renderer/test_runner/event_sender.cc
diff --git a/content/shell/renderer/test_runner/event_sender.cc b/content/shell/renderer/test_runner/event_sender.cc
index e1e47012d5e36d105c44fade98a6e48a8d9e091b..392ef75ea5a6f8cd9efe833e410109f504a27653 100644
--- a/content/shell/renderer/test_runner/event_sender.cc
+++ b/content/shell/renderer/test_runner/event_sender.cc
@@ -1640,10 +1640,8 @@
void EventSender::AddTouchPoint(gin::Arguments* args) {
double x;
double y;
- if (!args->GetNext(&x) || !args->GetNext(&y)) {
- args->ThrowError();
- return;
- }
+ args->GetNext(&x);
+ args->GetNext(&y);
WebTouchPoint touch_point;
touch_point.state = WebTouchPoint::StatePressed;
@@ -1763,10 +1761,8 @@
double x;
double y;
- if (!args->GetNext(&x) || !args->GetNext(&y)) {
- args->ThrowError();
- return;
- }
+ args->GetNext(&x);
+ args->GetNext(&y);
WebPoint mouse_pos(static_cast<int>(x), static_cast<int>(y));
int modifiers = 0;
@@ -1928,10 +1924,9 @@
gin::Arguments* args) {
double x;
double y;
- if (!args->GetNext(&x) || !args->GetNext(&y)) {
- args->ThrowError();
- return;
- }
+ args->GetNext(&x);
+ args->GetNext(&y);
+ WebPoint point(x, y);
WebGestureEvent event;
event.type = type;
@@ -1949,7 +1944,7 @@
current_gesture_location_.y + event.data.scrollUpdate.deltaY;
break;
case WebInputEvent::GestureScrollBegin:
- current_gesture_location_ = WebPoint(x, y);
+ current_gesture_location_ = WebPoint(point.x, point.y);
event.x = current_gesture_location_.x;
event.y = current_gesture_location_.y;
break;
@@ -1984,8 +1979,8 @@
event.data.tap.tapCount = tap_count;
event.data.tap.width = width;
event.data.tap.height = height;
- event.x = x;
- event.y = y;
+ event.x = point.x;
+ event.y = point.y;
break;
}
case WebInputEvent::GestureTapUnconfirmed:
@@ -1999,8 +1994,8 @@
} else {
event.data.tap.tapCount = 1;
}
- event.x = x;
- event.y = y;
+ event.x = point.x;
+ event.y = point.y;
break;
case WebInputEvent::GestureTapDown:
{
@@ -2018,8 +2013,8 @@
return;
}
}
- event.x = x;
- event.y = y;
+ event.x = point.x;
+ event.y = point.y;
event.data.tapDown.width = width;
event.data.tapDown.height = height;
break;
@@ -2040,19 +2035,19 @@
}
}
}
- event.x = x;
- event.y = y;
+ event.x = point.x;
+ event.y = point.y;
event.data.showPress.width = width;
event.data.showPress.height = height;
break;
}
case WebInputEvent::GestureTapCancel:
- event.x = x;
- event.y = y;
+ event.x = point.x;
+ event.y = point.y;
break;
case WebInputEvent::GestureLongPress:
- event.x = x;
- event.y = y;
+ event.x = point.x;
+ event.y = point.y;
if (!args->PeekNext().IsEmpty()) {
float width;
if (!args->GetNext(&width)) {
@@ -2071,8 +2066,8 @@
}
break;
case WebInputEvent::GestureLongTap:
- event.x = x;
- event.y = y;
+ event.x = point.x;
+ event.y = point.y;
if (!args->PeekNext().IsEmpty()) {
float width;
if (!args->GetNext(&width)) {
@@ -2091,8 +2086,8 @@
}
break;
case WebInputEvent::GestureTwoFingerTap:
- event.x = x;
- event.y = y;
+ event.x = point.x;
+ event.y = point.y;
if (!args->PeekNext().IsEmpty()) {
float first_finger_width;
if (!args->GetNext(&first_finger_width)) {
@@ -2128,7 +2123,7 @@
WebMouseEvent mouse_event;
InitMouseEvent(WebInputEvent::MouseDown,
pressed_button_,
- WebPoint(x, y),
+ point,
GetCurrentEventTimeSec(),
click_count_,
0,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698