| Index: third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h b/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h
|
| index 81a159d9dd1da04e343d7e54b831180486763f11..7fe9535f8fcefac6bd61d01beae8b82d5e74de08 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/WrapperTypeInfo.h
|
| @@ -57,7 +57,7 @@ typedef void (*DerefObjectFunction)(ScriptWrappable*);
|
| typedef void (*TraceFunction)(Visitor*, ScriptWrappable*);
|
| typedef ActiveDOMObject* (*ToActiveDOMObjectFunction)(v8::Local<v8::Object>);
|
| typedef void (*ResolveWrapperReachabilityFunction)(v8::Isolate*, ScriptWrappable*, const v8::Persistent<v8::Object>&);
|
| -typedef void (*PreparePrototypeObjectFunction)(v8::Isolate*, v8::Local<v8::Object>, v8::Local<v8::FunctionTemplate>);
|
| +typedef void (*PreparePrototypeAndInterfaceObjectFunction)(v8::Isolate*, v8::Local<v8::Object>, v8::Local<v8::Function>, v8::Local<v8::FunctionTemplate>);
|
| typedef void (*InstallConditionallyEnabledPropertiesFunction)(v8::Local<v8::Object>, v8::Isolate*);
|
|
|
| inline void setObjectGroup(v8::Isolate* isolate, ScriptWrappable* scriptWrappable, const v8::Persistent<v8::Object>& wrapper)
|
| @@ -169,10 +169,10 @@ struct WrapperTypeInfo {
|
| return traceFunction(visitor, scriptWrappable);
|
| }
|
|
|
| - void preparePrototypeObject(v8::Isolate* isolate, v8::Local<v8::Object> prototypeObject, v8::Local<v8::FunctionTemplate> interfaceTemplate) const
|
| + void preparePrototypeAndInterfaceObject(v8::Isolate* isolate, v8::Local<v8::Object> prototypeObject, v8::Local<v8::Function> interfaceObject, v8::Local<v8::FunctionTemplate> interfaceTemplate) const
|
| {
|
| - if (preparePrototypeObjectFunction)
|
| - preparePrototypeObjectFunction(isolate, prototypeObject, interfaceTemplate);
|
| + if (preparePrototypeAndInterfaceObjectFunction)
|
| + preparePrototypeAndInterfaceObjectFunction(isolate, prototypeObject, interfaceObject, interfaceTemplate);
|
| }
|
|
|
| void installConditionallyEnabledProperties(v8::Local<v8::Object> prototypeObject, v8::Isolate* isolate) const
|
| @@ -207,7 +207,7 @@ struct WrapperTypeInfo {
|
| const TraceFunction traceFunction;
|
| const ToActiveDOMObjectFunction toActiveDOMObjectFunction;
|
| const ResolveWrapperReachabilityFunction visitDOMWrapperFunction;
|
| - PreparePrototypeObjectFunction preparePrototypeObjectFunction;
|
| + PreparePrototypeAndInterfaceObjectFunction preparePrototypeAndInterfaceObjectFunction;
|
| const InstallConditionallyEnabledPropertiesFunction installConditionallyEnabledPropertiesFunction;
|
| const char* const interfaceName;
|
| const WrapperTypeInfo* parentClass;
|
|
|