EventSender: Added checks for missing arguments

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/stringprintf.h"
 #include "content/public/common/page_zoom.h"
@@ skipping 1622 matching lines @@
   // need/want that.
   is_drag_mode_ = false;
 
   // Make the rest of eventSender think a drag is in progress.
   pressed_button_ = WebMouseEvent::ButtonLeft;
 }
 
 void EventSender::AddTouchPoint(gin::Arguments* args) {
   double x;
   double y;
-  args->GetNext(&x);
-  args->GetNext(&y);
+  if (!args->GetNext(&x)) {
+    args->ThrowError();
+    return;
+  }
+  if (!args->GetNext(&y)) {
+    args->ThrowError();

[earthdok, 2014/09/23 15:44:46]

Why not merge the two if statements? (Unless of course the exception includes a
stack trace pointing to the specific ThrowError() call.)

[mustaq, 2014/09/23 15:56:16]

Good point. The merging doesn't obscure the error message very much because
ThrowError points to the "position" of the failed argument:
https://code.google.com/p/chromium/codesearch#chromium/src/gin/arguments.cc&l=40

+    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)) {
@@ skipping 99 matching lines @@
   InitMouseWheelEvent(args, true, &event);
   view_->handleInputEvent(event);
 }
 
 void EventSender::MouseMoveTo(gin::Arguments* args) {
   if (force_layout_on_events_)
     view_->layout();
 
   double x;
   double y;
-  args->GetNext(&x);
-  args->GetNext(&y);
+  if (!args->GetNext(&x)) {
+    args->ThrowError();
+    return;
+  }
+  if (!args->GetNext(&y)) {
+    args->ThrowError();
+    return;
+  }
   WebPoint mouse_pos(static_cast<int>(x), static_cast<int>(y));
 
   int modifiers = 0;
   if (!args->PeekNext().IsEmpty())
     modifiers = GetKeyModifiersFromV8(args->PeekNext());
 
   if (is_drag_mode_ && pressed_button_ == WebMouseEvent::ButtonLeft &&
       !replaying_saved_events_) {
     SavedEvent saved_event;
     saved_event.type = SavedEvent::TYPE_MOUSE_MOVE;
@@ skipping 141 matching lines @@
       --i;
     } else
       touch_point->state = WebTouchPoint::StateStationary;
   }
 }
 
 void EventSender::GestureEvent(WebInputEvent::Type type,
                                gin::Arguments* args) {
   double x;
   double y;
-  args->GetNext(&x);
-  args->GetNext(&y);
-  WebPoint point(x, y);
+  if (!args->GetNext(&x)) {
+    args->ThrowError();
+    return;
+  }
+  if (!args->GetNext(&y)) {
+    args->ThrowError();
+    return;
+  }
 
   WebGestureEvent event;
   event.type = type;
 
   switch (type) {
     case WebInputEvent::GestureScrollUpdate:
     case WebInputEvent::GestureScrollUpdateWithoutPropagation:
       event.data.scrollUpdate.deltaX = static_cast<float>(x);
       event.data.scrollUpdate.deltaY = static_cast<float>(y);
       event.x = current_gesture_location_.x;
       event.y = current_gesture_location_.y;
       current_gesture_location_.x =
           current_gesture_location_.x + event.data.scrollUpdate.deltaX;
       current_gesture_location_.y =
           current_gesture_location_.y + event.data.scrollUpdate.deltaY;
       break;
     case WebInputEvent::GestureScrollBegin:
-      current_gesture_location_ = WebPoint(point.x, point.y);
+      current_gesture_location_ = WebPoint(x, y);
       event.x = current_gesture_location_.x;
       event.y = current_gesture_location_.y;
       break;
     case WebInputEvent::GestureScrollEnd:
     case WebInputEvent::GestureFlingStart:
       event.x = current_gesture_location_.x;
       event.y = current_gesture_location_.y;
       break;
     case WebInputEvent::GestureTap:
     {
@@ skipping 14 matching lines @@
       }
       if (!args->PeekNext().IsEmpty()) {
         if (!args->GetNext(&height)) {
           args->ThrowError();
           return;
         }
       }
       event.data.tap.tapCount = tap_count;
       event.data.tap.width = width;
       event.data.tap.height = height;
-      event.x = point.x;
-      event.y = point.y;
+      event.x = x;
+      event.y = y;
       break;
     }
     case WebInputEvent::GestureTapUnconfirmed:
       if (!args->PeekNext().IsEmpty()) {
         float tap_count;
         if (!args->GetNext(&tap_count)) {
           args->ThrowError();
           return;
         }
         event.data.tap.tapCount = tap_count;
       } else {
         event.data.tap.tapCount = 1;
       }
-      event.x = point.x;
-      event.y = point.y;
+      event.x = x;
+      event.y = y;
       break;
     case WebInputEvent::GestureTapDown:
     {
       float width = 30;
       float height = 30;
       if (!args->PeekNext().IsEmpty()) {
         if (!args->GetNext(&width)) {
           args->ThrowError();
           return;
         }
       }
       if (!args->PeekNext().IsEmpty()) {
         if (!args->GetNext(&height)) {
           args->ThrowError();
           return;
         }
       }
-      event.x = point.x;
-      event.y = point.y;
+      event.x = x;
+      event.y = y;
       event.data.tapDown.width = width;
       event.data.tapDown.height = height;
       break;
     }
     case WebInputEvent::GestureShowPress:
     {
       float width = 30;
       float height = 30;
       if (!args->PeekNext().IsEmpty()) {
         if (!args->GetNext(&width)) {
           args->ThrowError();
           return;
         }
         if (!args->PeekNext().IsEmpty()) {
           if (!args->GetNext(&height)) {
             args->ThrowError();
             return;
           }
         }
       }
-      event.x = point.x;
-      event.y = point.y;
+      event.x = x;
+      event.y = y;
       event.data.showPress.width = width;
       event.data.showPress.height = height;
       break;
     }
     case WebInputEvent::GestureTapCancel:
-      event.x = point.x;
-      event.y = point.y;
+      event.x = x;
+      event.y = y;
       break;
     case WebInputEvent::GestureLongPress:
-      event.x = point.x;
-      event.y = point.y;
+      event.x = x;
+      event.y = y;
       if (!args->PeekNext().IsEmpty()) {
         float width;
         if (!args->GetNext(&width)) {
           args->ThrowError();
           return;
         }
         event.data.longPress.width = width;
         if (!args->PeekNext().IsEmpty()) {
           float height;
           if (!args->GetNext(&height)) {
             args->ThrowError();
             return;
           }
           event.data.longPress.height = height;
         }
       }
       break;
     case WebInputEvent::GestureLongTap:
-      event.x = point.x;
-      event.y = point.y;
+      event.x = x;
+      event.y = y;
       if (!args->PeekNext().IsEmpty()) {
         float width;
         if (!args->GetNext(&width)) {
           args->ThrowError();
           return;
         }
         event.data.longPress.width = width;
         if (!args->PeekNext().IsEmpty()) {
           float height;
           if (!args->GetNext(&height)) {
             args->ThrowError();
             return;
           }
           event.data.longPress.height = height;
         }
       }
       break;
     case WebInputEvent::GestureTwoFingerTap:
-      event.x = point.x;
-      event.y = point.y;
+      event.x = x;
+      event.y = y;
       if (!args->PeekNext().IsEmpty()) {
         float first_finger_width;
         if (!args->GetNext(&first_finger_width)) {
           args->ThrowError();
           return;
         }
         event.data.twoFingerTap.firstFingerWidth = first_finger_width;
         if (!args->PeekNext().IsEmpty()) {
           float first_finger_height;
           if (!args->GetNext(&first_finger_height)) {
@@ skipping 15 matching lines @@
   if (force_layout_on_events_)
     view_->layout();
 
   bool result = view_->handleInputEvent(event);
 
   // Long press might start a drag drop session. Complete it if so.
   if (type == WebInputEvent::GestureLongPress && !current_drag_data_.isNull()) {
     WebMouseEvent mouse_event;
     InitMouseEvent(WebInputEvent::MouseDown,
                    pressed_button_,
-                   point,
+                   WebPoint(x, y),
                    GetCurrentEventTimeSec(),
                    click_count_,
                    0,
                    &mouse_event);
 
     FinishDragAndDrop(mouse_event, blink::WebDragOperationNone);
   }
   args->Return(result);
 }
 
@@ skipping 154 matching lines @@
       }
       default:
         NOTREACHED();
     }
   }
 
   replaying_saved_events_ = false;
 }
 
 }  // namespace content