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 a6482a7d3c5bd244f76ad30bdee9e107b112904f..b6d83b80ab4d1edd8de26812b6645e2f5f501ff7 100644 |
--- a/content/shell/renderer/test_runner/event_sender.cc |
+++ b/content/shell/renderer/test_runner/event_sender.cc |
@@ -116,13 +116,13 @@ int GetKeyModifiers(const std::vector<std::string>& modifier_names) { |
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); |
} |
@@ -916,7 +916,7 @@ void EventSenderBindings::ScheduleAsynchronousClick(gin::Arguments* args) { |
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); |
} |
@@ -932,7 +932,7 @@ void EventSenderBindings::ScheduleAsynchronousKeyDown(gin::Arguments* args) { |
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); |
} |
@@ -949,7 +949,7 @@ void EventSenderBindings::MouseDown(gin::Arguments* args) { |
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); |
} |
@@ -963,7 +963,7 @@ void EventSenderBindings::MouseUp(gin::Arguments* args) { |
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); |
} |
@@ -979,7 +979,7 @@ void EventSenderBindings::KeyDown(gin::Arguments* args) { |
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); |
} |
@@ -1908,7 +1908,7 @@ void EventSender::MouseMoveTo(gin::Arguments* args) { |
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_) { |
@@ -2387,7 +2387,7 @@ void EventSender::InitMouseWheelEvent(gin::Arguments* args, |
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); |
} |