| Index: extensions/renderer/v8_context_native_handler.cc
|
| diff --git a/extensions/renderer/v8_context_native_handler.cc b/extensions/renderer/v8_context_native_handler.cc
|
| index 6fbc8b246b37e16cfd3382bcdc24ec1f0169be5c..d81c8134a990777aaf50be8d9f919ee80c0379cd 100644
|
| --- a/extensions/renderer/v8_context_native_handler.cc
|
| +++ b/extensions/renderer/v8_context_native_handler.cc
|
| @@ -53,15 +53,20 @@ void V8ContextNativeHandler::GetModuleSystem(
|
| v8::Local<v8::Object>::Cast(args[0])->CreationContext();
|
| ScriptContext* context =
|
| dispatcher_->script_context_set().GetByV8Context(v8_context);
|
| - args.GetReturnValue().Set(context->module_system()->NewInstance());
|
| + v8::Local<v8::Value> instance;
|
| + if (!context->module_system()->NewInstance().ToLocal(&instance))
|
| + NOTREACHED(); // This can happen if v8 has issues
|
| + args.GetReturnValue().Set(instance);
|
| }
|
|
|
| void V8ContextNativeHandler::RunWithNativesEnabledModuleSystem(
|
| const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| CHECK_EQ(args.Length(), 1);
|
| CHECK(args[0]->IsFunction());
|
| - v8::Local<v8::Value> call_with_args[] = {
|
| - context()->module_system()->NewInstance()};
|
| + v8::Local<v8::Value> instance;
|
| + if (!context()->module_system()->NewInstance().ToLocal(&instance))
|
| + NOTREACHED(); // This can happen if v8 has issues
|
| + v8::Local<v8::Value> call_with_args[] = {instance};
|
| ModuleSystem::NativesEnabledScope natives_enabled(context()->module_system());
|
| context()->CallFunction(v8::Local<v8::Function>::Cast(args[0]), 1,
|
| call_with_args);
|
|
|