Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(856)

Unified Diff: extensions/renderer/v8_context_native_handler.cc

Issue 1192763002: extensions: Use V8 Maybe APIs in NativeHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);

Powered by Google App Engine
This is Rietveld 408576698