| Index: third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.cpp b/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.cpp
|
| index 5c807483a15ed1c44f3948e8d5028a4e49cbf640..21741c26984d2157ad11b5e111a57b1594421170 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.cpp
|
| @@ -304,12 +304,21 @@ void V8DOMConfiguration::installMethod(v8::Isolate* isolate, v8::Local<v8::Objec
|
| installMethodInternal(isolate, v8::Local<v8::ObjectTemplate>(), prototypeTemplate, v8::Local<v8::FunctionTemplate>(), signature, method, world);
|
| }
|
|
|
| -void V8DOMConfiguration::initializeDOMInterfaceTemplate(v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> interfaceTemplate, const char* interfaceName, v8::Local<v8::FunctionTemplate> parentInterfaceTemplate, size_t v8InternalFieldCount)
|
| +v8::Local<v8::Signature> V8DOMConfiguration::installProperties(v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> instanceTemplate, v8::Local<v8::ObjectTemplate> prototypeTemplate, v8::Local<v8::FunctionTemplate> interfaceTemplate, v8::Local<v8::Signature> signature, const AttributeConfiguration attributes[], size_t attributeCount, const AccessorConfiguration accessors[], size_t accessorCount, const MethodConfiguration methods[], size_t methodCount)
|
| +{
|
| + if (attributeCount)
|
| + installAttributes(isolate, instanceTemplate, prototypeTemplate, attributes, attributeCount);
|
| + if (accessorCount)
|
| + installAccessors(isolate, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, accessors, accessorCount);
|
| + if (methodCount)
|
| + installMethods(isolate, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, methods, methodCount);
|
| + return signature;
|
| +}
|
| +
|
| +void V8DOMConfiguration::initializeDOMInterfaceTemplate(v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> interfaceTemplate, const char* interfaceName, v8::Local<v8::FunctionTemplate> parentInterfaceTemplate, v8::Local<v8::ObjectTemplate> instanceTemplate, v8::Local<v8::ObjectTemplate> prototypeTemplate, size_t v8InternalFieldCount)
|
| {
|
| interfaceTemplate->SetClassName(v8AtomicString(isolate, interfaceName));
|
| interfaceTemplate->ReadOnlyPrototype();
|
| - v8::Local<v8::ObjectTemplate> instanceTemplate = interfaceTemplate->InstanceTemplate();
|
| - v8::Local<v8::ObjectTemplate> prototypeTemplate = interfaceTemplate->PrototypeTemplate();
|
| instanceTemplate->SetInternalFieldCount(v8InternalFieldCount);
|
| // TODO(yukishiino): We should set the class string to the platform object
|
| // (|instanceTemplate|), too. The reason that we don't set it is that
|
| @@ -326,6 +335,12 @@ void V8DOMConfiguration::initializeDOMInterfaceTemplate(v8::Isolate* isolate, v8
|
| }
|
| }
|
|
|
| +void V8DOMConfiguration::initializeDOMInterfaceTemplate(v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> interfaceTemplate, const char* interfaceName, v8::Local<v8::FunctionTemplate> parentInterfaceTemplate, v8::Local<v8::ObjectTemplate> instanceTemplate, v8::Local<v8::ObjectTemplate> prototypeTemplate, size_t v8InternalFieldCount, v8::Local<v8::Signature> signature, const AttributeConfiguration attributes[], size_t attributeCount, const AccessorConfiguration accessors[], size_t accessorCount, const MethodConfiguration methods[], size_t methodCount)
|
| +{
|
| + initializeDOMInterfaceTemplate(isolate, interfaceTemplate, interfaceName, parentInterfaceTemplate, instanceTemplate, prototypeTemplate, v8InternalFieldCount);
|
| + installProperties(isolate, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, attributes, attributeCount, accessors, accessorCount, methods, methodCount);
|
| +}
|
| +
|
| v8::Local<v8::FunctionTemplate> V8DOMConfiguration::domClassTemplate(v8::Isolate* isolate, WrapperTypeInfo* wrapperTypeInfo, void (*configureDOMClassTemplate)(v8::Local<v8::FunctionTemplate>, v8::Isolate*))
|
| {
|
| V8PerIsolateData* data = V8PerIsolateData::from(isolate);
|
|
|