Re-land: gin: Use V8 Maybe APIs

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 98 matching lines @@
 
 int GetKeyModifiers(const std::vector<std::string>& modifier_names) {
   int modifiers = 0;
   for (std::vector<std::string>::const_iterator it = modifier_names.begin();
        it != modifier_names.end(); ++it) {
     modifiers |= GetKeyModifier(*it);
   }
   return modifiers;
 }
 
-int GetKeyModifiersFromV8(v8::Local<v8::Value> value) {
+int GetKeyModifiersFromV8(v8::Isolate* isolate, v8::Local<v8::Value> value) {
   std::vector<std::string> modifier_names;
   if (value->IsString()) {
     modifier_names.push_back(gin::V8ToString(value));
   } else if (value->IsArray()) {
     gin::Converter<std::vector<std::string> >::FromV8(
-        NULL, value, &modifier_names);
+        isolate, value, &modifier_names);
   }
   return GetKeyModifiers(modifier_names);
 }
 
 // Maximum distance (in space and time) for a mouse click to register as a
 // double or triple click.
 const double kMultipleClickTimeSec = 1;
 const int kMultipleClickRadiusPixels = 5;
 const char kSubMenuDepthIdentifier[] = "_";
 const char kSubMenuIdentifier[] = " >";
@@ skipping 773 matching lines @@
 
 void EventSenderBindings::ScheduleAsynchronousClick(gin::Arguments* args) {
   if (!sender_)
     return;
 
   int button_number = 0;
   int modifiers = 0;
   if (!args->PeekNext().IsEmpty()) {
     args->GetNext(&button_number);
     if (!args->PeekNext().IsEmpty())
-      modifiers = GetKeyModifiersFromV8(args->PeekNext());
+      modifiers = GetKeyModifiersFromV8(args->isolate(), args->PeekNext());
   }
   sender_->ScheduleAsynchronousClick(button_number, modifiers);
 }
 
 void EventSenderBindings::ScheduleAsynchronousKeyDown(gin::Arguments* args) {
   if (!sender_)
     return;
 
   std::string code_str;
   int modifiers = 0;
   int location = DOMKeyLocationStandard;
   args->GetNext(&code_str);
   if (!args->PeekNext().IsEmpty()) {
     v8::Local<v8::Value> value;
     args->GetNext(&value);
-    modifiers = GetKeyModifiersFromV8(value);
+    modifiers = GetKeyModifiersFromV8(args->isolate(), value);
     if (!args->PeekNext().IsEmpty())
       args->GetNext(&location);
   }
   sender_->ScheduleAsynchronousKeyDown(code_str, modifiers,
                                        static_cast<KeyLocationCode>(location));
 }
 
 void EventSenderBindings::MouseDown(gin::Arguments* args) {
   if (!sender_)
     return;
 
   int button_number = 0;
   int modifiers = 0;
   if (!args->PeekNext().IsEmpty()) {
     args->GetNext(&button_number);
     if (!args->PeekNext().IsEmpty())
-      modifiers = GetKeyModifiersFromV8(args->PeekNext());
+      modifiers = GetKeyModifiersFromV8(args->isolate(), args->PeekNext());
   }
   sender_->MouseDown(button_number, modifiers);
 }
 
 void EventSenderBindings::MouseUp(gin::Arguments* args) {
   if (!sender_)
     return;
 
   int button_number = 0;
   int modifiers = 0;
   if (!args->PeekNext().IsEmpty()) {
     args->GetNext(&button_number);
     if (!args->PeekNext().IsEmpty())
-      modifiers = GetKeyModifiersFromV8(args->PeekNext());
+      modifiers = GetKeyModifiersFromV8(args->isolate(), args->PeekNext());
   }
   sender_->MouseUp(button_number, modifiers);
 }
 
 void EventSenderBindings::KeyDown(gin::Arguments* args) {
   if (!sender_)
     return;
 
   std::string code_str;
   int modifiers = 0;
   int location = DOMKeyLocationStandard;
   args->GetNext(&code_str);
   if (!args->PeekNext().IsEmpty()) {
     v8::Local<v8::Value> value;
     args->GetNext(&value);
-    modifiers = GetKeyModifiersFromV8(value);
+    modifiers = GetKeyModifiersFromV8(args->isolate(), value);
     if (!args->PeekNext().IsEmpty())
       args->GetNext(&location);
   }
   sender_->KeyDown(code_str, modifiers, static_cast<KeyLocationCode>(location));
 }
 
 bool EventSenderBindings::ForceLayoutOnEvents() const {
   if (sender_)
     return sender_->force_layout_on_events();
   return false;
@@ skipping 908 matching lines @@
   double x;
   double y;
   if (!args->GetNext(&x) || !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());
+    modifiers = GetKeyModifiersFromV8(args->isolate(), args->PeekNext());
 
   if (is_drag_mode_ && pressed_button_ == WebMouseEvent::ButtonLeft &&
       !replaying_saved_events_) {
     SavedEvent saved_event;
     saved_event.type = SavedEvent::TYPE_MOUSE_MOVE;
     saved_event.pos = mouse_pos;
     saved_event.modifiers = modifiers;
     mouse_event_queue_.push_back(saved_event);
   } else {
     WebMouseEvent event;
@@ skipping 458 matching lines @@
   bool has_precise_scrolling_deltas = false;
   int modifiers = 0;
   bool can_scroll = true;
   if (!args->PeekNext().IsEmpty()) {
     args->GetNext(&paged);
     if (!args->PeekNext().IsEmpty()) {
       args->GetNext(&has_precise_scrolling_deltas);
       if (!args->PeekNext().IsEmpty()) {
         v8::Local<v8::Value> value;
         args->GetNext(&value);
-        modifiers = GetKeyModifiersFromV8(value);
+        modifiers = GetKeyModifiersFromV8(args->isolate(), value);
         if (!args->PeekNext().IsEmpty())
           args->GetNext(&can_scroll);
       }
     }
   }
 
   InitMouseEvent(WebInputEvent::MouseWheel,
                  pressed_button_,
                  last_mouse_pos_,
                  GetCurrentEventTimeSec(),
@@ skipping 116 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