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

Unified Diff: gin/modules/module_registry.cc

Issue 89723002: Convert the rest of the functions in core.cc to use CreateFunctionTemplate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: realized didn't need changes to ArrayBuffer::Private Created 7 years, 1 month 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: gin/modules/module_registry.cc
diff --git a/gin/modules/module_registry.cc b/gin/modules/module_registry.cc
index d868dec5bb15203d3d351d0ed141376e9b735862..6eba6f5058b2fd1439c165e9348c32ef4c3884e3 100644
--- a/gin/modules/module_registry.cc
+++ b/gin/modules/module_registry.cc
@@ -111,7 +111,7 @@ ModuleRegistry* ModuleRegistry::From(v8::Handle<Context> context) {
v8::Handle<String> key = GetHiddenValueKey(isolate);
v8::Handle<Value> value = context->Global()->GetHiddenValue(key);
v8::Handle<External> external;
- if (value.IsEmpty() || !ConvertFromV8(value, &external)) {
+ if (value.IsEmpty() || !ConvertFromV8(isolate, value, &external)) {
PerContextData* data = PerContextData::From(context);
if (!data)
return NULL;
@@ -181,12 +181,13 @@ void ModuleRegistry::Load(Isolate* isolate, scoped_ptr<PendingModule> pending) {
v8::Handle<Value> module = Local<Value>::New(isolate, pending->factory);
v8::Handle<Function> factory;
- if (ConvertFromV8(module, &factory)) {
+ if (ConvertFromV8(isolate, module, &factory)) {
PerContextData* data = PerContextData::From(isolate->GetCurrentContext());
Runner* runner = data->runner();
module = runner->Call(factory, runner->global(), argc, argv.data());
if (pending->id.empty())
- ConvertFromV8(factory->GetScriptOrigin().ResourceName(), &pending->id);
+ ConvertFromV8(isolate, factory->GetScriptOrigin().ResourceName(),
+ &pending->id);
}
RegisterModule(isolate, pending->id, module);

Powered by Google App Engine
This is Rietveld 408576698