summaryrefslogtreecommitdiffstats
path: root/gin/modules
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-27 03:38:26 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-27 03:38:26 +0000
commit7618ebbb8685c7bb6d1477791c524d667cae2f70 (patch)
tree4ae52faf34f9b2afd83cb81ceb6ef60a3db66e93 /gin/modules
parent2ff0a25baaf6a542fadd4cfd32589476b8eba3b0 (diff)
downloadchromium_src-7618ebbb8685c7bb6d1477791c524d667cae2f70.zip
chromium_src-7618ebbb8685c7bb6d1477791c524d667cae2f70.tar.gz
chromium_src-7618ebbb8685c7bb6d1477791c524d667cae2f70.tar.bz2
Convert the rest of the functions in core.cc to use CreateFunctionTemplate.
BUG= Review URL: https://codereview.chromium.org/89723002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gin/modules')
-rw-r--r--gin/modules/module_registry.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/gin/modules/module_registry.cc b/gin/modules/module_registry.cc
index d868dec..6eba6f5 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);