Merge from Chromium at DEPS revision r200144
This commit was generated by merge_to_master.py.
Change-Id: I52995489013675af682cee321f417f624396b584
diff --git a/Source/bindings/v8/V8NPObject.cpp b/Source/bindings/v8/V8NPObject.cpp
index 9dfb6f7..1b45891 100644
--- a/Source/bindings/v8/V8NPObject.cpp
+++ b/Source/bindings/v8/V8NPObject.cpp
@@ -251,7 +251,7 @@
// Create a new template.
v8::Local<v8::FunctionTemplate> temp = v8::FunctionTemplate::New();
temp->SetCallHandler(npObjectMethodHandler, key);
- functionTemplate = v8::Persistent<v8::FunctionTemplate>::New(isolate, temp);
+ functionTemplate.Reset(isolate, temp);
V8NPTemplateMap::sharedInstance(isolate).set(id, functionTemplate);
}
@@ -430,7 +430,7 @@
// can be used by DOM bindings.
v8::Isolate* isolate = v8::Isolate::GetCurrent();
if (npObjectDesc.IsEmpty()) {
- npObjectDesc = v8::Persistent<v8::FunctionTemplate>::New(isolate, v8::FunctionTemplate::New());
+ npObjectDesc.Reset(isolate, v8::FunctionTemplate::New());
npObjectDesc->InstanceTemplate()->SetInternalFieldCount(npObjectInternalFieldCount);
npObjectDesc->InstanceTemplate()->SetNamedPropertyHandler(npObjectNamedPropertyGetter, npObjectNamedPropertySetter, npObjectQueryProperty, 0, npObjectNamedPropertyEnumerator);
npObjectDesc->InstanceTemplate()->SetIndexedPropertyHandler(npObjectIndexedPropertyGetter, npObjectIndexedPropertySetter, 0, 0, npObjectIndexedPropertyEnumerator);