Commit 0fff7fc3 authored by mustaq's avatar mustaq Committed by Commit bot

Added checks for missing arguments in event_sender.cc. Also simplified the...

Added checks for missing arguments in event_sender.cc. Also simplified the uses of x & y in EventSender::GestureEvent.

BUG=415970

Review URL: https://codereview.chromium.org/584203003

Cr-Commit-Position: refs/heads/master@{#296505}
parent ff0c52fb
...@@ -1640,8 +1640,10 @@ void EventSender::BeginDragWithFiles(const std::vector<std::string>& files) { ...@@ -1640,8 +1640,10 @@ void EventSender::BeginDragWithFiles(const std::vector<std::string>& files) {
void EventSender::AddTouchPoint(gin::Arguments* args) { void EventSender::AddTouchPoint(gin::Arguments* args) {
double x; double x;
double y; double y;
args->GetNext(&x); if (!args->GetNext(&x) || !args->GetNext(&y)) {
args->GetNext(&y); args->ThrowError();
return;
}
WebTouchPoint touch_point; WebTouchPoint touch_point;
touch_point.state = WebTouchPoint::StatePressed; touch_point.state = WebTouchPoint::StatePressed;
...@@ -1761,8 +1763,10 @@ void EventSender::MouseMoveTo(gin::Arguments* args) { ...@@ -1761,8 +1763,10 @@ void EventSender::MouseMoveTo(gin::Arguments* args) {
double x; double x;
double y; double y;
args->GetNext(&x); if (!args->GetNext(&x) || !args->GetNext(&y)) {
args->GetNext(&y); args->ThrowError();
return;
}
WebPoint mouse_pos(static_cast<int>(x), static_cast<int>(y)); WebPoint mouse_pos(static_cast<int>(x), static_cast<int>(y));
int modifiers = 0; int modifiers = 0;
...@@ -1924,9 +1928,10 @@ void EventSender::GestureEvent(WebInputEvent::Type type, ...@@ -1924,9 +1928,10 @@ void EventSender::GestureEvent(WebInputEvent::Type type,
gin::Arguments* args) { gin::Arguments* args) {
double x; double x;
double y; double y;
args->GetNext(&x); if (!args->GetNext(&x) || !args->GetNext(&y)) {
args->GetNext(&y); args->ThrowError();
WebPoint point(x, y); return;
}
WebGestureEvent event; WebGestureEvent event;
event.type = type; event.type = type;
...@@ -1944,7 +1949,7 @@ void EventSender::GestureEvent(WebInputEvent::Type type, ...@@ -1944,7 +1949,7 @@ void EventSender::GestureEvent(WebInputEvent::Type type,
current_gesture_location_.y + event.data.scrollUpdate.deltaY; current_gesture_location_.y + event.data.scrollUpdate.deltaY;
break; break;
case WebInputEvent::GestureScrollBegin: case WebInputEvent::GestureScrollBegin:
current_gesture_location_ = WebPoint(point.x, point.y); current_gesture_location_ = WebPoint(x, y);
event.x = current_gesture_location_.x; event.x = current_gesture_location_.x;
event.y = current_gesture_location_.y; event.y = current_gesture_location_.y;
break; break;
...@@ -1979,8 +1984,8 @@ void EventSender::GestureEvent(WebInputEvent::Type type, ...@@ -1979,8 +1984,8 @@ void EventSender::GestureEvent(WebInputEvent::Type type,
event.data.tap.tapCount = tap_count; event.data.tap.tapCount = tap_count;
event.data.tap.width = width; event.data.tap.width = width;
event.data.tap.height = height; event.data.tap.height = height;
event.x = point.x; event.x = x;
event.y = point.y; event.y = y;
break; break;
} }
case WebInputEvent::GestureTapUnconfirmed: case WebInputEvent::GestureTapUnconfirmed:
...@@ -1994,8 +1999,8 @@ void EventSender::GestureEvent(WebInputEvent::Type type, ...@@ -1994,8 +1999,8 @@ void EventSender::GestureEvent(WebInputEvent::Type type,
} else { } else {
event.data.tap.tapCount = 1; event.data.tap.tapCount = 1;
} }
event.x = point.x; event.x = x;
event.y = point.y; event.y = y;
break; break;
case WebInputEvent::GestureTapDown: case WebInputEvent::GestureTapDown:
{ {
...@@ -2013,8 +2018,8 @@ void EventSender::GestureEvent(WebInputEvent::Type type, ...@@ -2013,8 +2018,8 @@ void EventSender::GestureEvent(WebInputEvent::Type type,
return; return;
} }
} }
event.x = point.x; event.x = x;
event.y = point.y; event.y = y;
event.data.tapDown.width = width; event.data.tapDown.width = width;
event.data.tapDown.height = height; event.data.tapDown.height = height;
break; break;
...@@ -2035,19 +2040,19 @@ void EventSender::GestureEvent(WebInputEvent::Type type, ...@@ -2035,19 +2040,19 @@ void EventSender::GestureEvent(WebInputEvent::Type type,
} }
} }
} }
event.x = point.x; event.x = x;
event.y = point.y; event.y = y;
event.data.showPress.width = width; event.data.showPress.width = width;
event.data.showPress.height = height; event.data.showPress.height = height;
break; break;
} }
case WebInputEvent::GestureTapCancel: case WebInputEvent::GestureTapCancel:
event.x = point.x; event.x = x;
event.y = point.y; event.y = y;
break; break;
case WebInputEvent::GestureLongPress: case WebInputEvent::GestureLongPress:
event.x = point.x; event.x = x;
event.y = point.y; event.y = y;
if (!args->PeekNext().IsEmpty()) { if (!args->PeekNext().IsEmpty()) {
float width; float width;
if (!args->GetNext(&width)) { if (!args->GetNext(&width)) {
...@@ -2066,8 +2071,8 @@ void EventSender::GestureEvent(WebInputEvent::Type type, ...@@ -2066,8 +2071,8 @@ void EventSender::GestureEvent(WebInputEvent::Type type,
} }
break; break;
case WebInputEvent::GestureLongTap: case WebInputEvent::GestureLongTap:
event.x = point.x; event.x = x;
event.y = point.y; event.y = y;
if (!args->PeekNext().IsEmpty()) { if (!args->PeekNext().IsEmpty()) {
float width; float width;
if (!args->GetNext(&width)) { if (!args->GetNext(&width)) {
...@@ -2086,8 +2091,8 @@ void EventSender::GestureEvent(WebInputEvent::Type type, ...@@ -2086,8 +2091,8 @@ void EventSender::GestureEvent(WebInputEvent::Type type,
} }
break; break;
case WebInputEvent::GestureTwoFingerTap: case WebInputEvent::GestureTwoFingerTap:
event.x = point.x; event.x = x;
event.y = point.y; event.y = y;
if (!args->PeekNext().IsEmpty()) { if (!args->PeekNext().IsEmpty()) {
float first_finger_width; float first_finger_width;
if (!args->GetNext(&first_finger_width)) { if (!args->GetNext(&first_finger_width)) {
...@@ -2123,7 +2128,7 @@ void EventSender::GestureEvent(WebInputEvent::Type type, ...@@ -2123,7 +2128,7 @@ void EventSender::GestureEvent(WebInputEvent::Type type,
WebMouseEvent mouse_event; WebMouseEvent mouse_event;
InitMouseEvent(WebInputEvent::MouseDown, InitMouseEvent(WebInputEvent::MouseDown,
pressed_button_, pressed_button_,
point, WebPoint(x, y),
GetCurrentEventTimeSec(), GetCurrentEventTimeSec(),
click_count_, click_count_,
0, 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment