Index: third_party/WebKit/Source/bindings/templates/interface.cpp |
diff --git a/third_party/WebKit/Source/bindings/templates/interface.cpp b/third_party/WebKit/Source/bindings/templates/interface.cpp |
index b48bc93cd083b457157e9fa935e44d5b211a2c9d..85d404ce60bd0fd5c6e44b37fdc5897a865cbcee 100644 |
--- a/third_party/WebKit/Source/bindings/templates/interface.cpp |
+++ b/third_party/WebKit/Source/bindings/templates/interface.cpp |
@@ -478,15 +478,17 @@ static void {{cpp_class}}OriginSafeMethodSetterCallback(v8::Local<v8::Name> name |
{% block named_constructor %} |
{% from 'methods.cpp' import generate_constructor with context %} |
{% if named_constructor %} |
-{% set to_active_scriptwrappable = '%s::toActiveScriptWrappable' % v8_class |
- if active_scriptwrappable else '0' %} |
+{% set active_scriptwrappable_inheritance = |
+ 'InheritFromActiveScriptWrappable' |
+ if active_scriptwrappable else |
+ 'NotInheritFromActiveScriptWrappable' %} |
// Suppress warning: global constructors, because struct WrapperTypeInfo is trivial |
// and does not depend on another global objects. |
#if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG) |
#pragma clang diagnostic push |
#pragma clang diagnostic ignored "-Wglobal-constructors" |
#endif |
-const WrapperTypeInfo {{v8_class}}Constructor::wrapperTypeInfo = { gin::kEmbedderBlink, {{v8_class}}Constructor::domTemplate, {{v8_class}}::trace, {{v8_class}}::traceWrappers, {{to_active_scriptwrappable}}, 0, {{v8_class}}::preparePrototypeAndInterfaceObject,{% if has_conditional_attributes_on_instance %} {{v8_class}}::installConditionallyEnabledProperties{% else %} nullptr{% endif %}, "{{interface_name}}", 0, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::{{wrapper_class_id}}, WrapperTypeInfo::{{event_target_inheritance}}, WrapperTypeInfo::{{lifetime}} }; |
+const WrapperTypeInfo {{v8_class}}Constructor::wrapperTypeInfo = { gin::kEmbedderBlink, {{v8_class}}Constructor::domTemplate, {{v8_class}}::trace, {{v8_class}}::traceWrappers, 0, {{v8_class}}::preparePrototypeAndInterfaceObject,{% if has_conditional_attributes_on_instance %} {{v8_class}}::installConditionallyEnabledProperties{% else %} nullptr{% endif %}, "{{interface_name}}", 0, WrapperTypeInfo::WrapperTypeObjectPrototype, WrapperTypeInfo::{{wrapper_class_id}}, WrapperTypeInfo::{{active_scriptwrappable_inheritance}}, WrapperTypeInfo::{{event_target_inheritance}}, WrapperTypeInfo::{{lifetime}} }; |
#if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG) |
#pragma clang diagnostic pop |
#endif |
@@ -925,18 +927,6 @@ V8DOMConfiguration::installAccessor(isolate, world, v8::Local<v8::Object>(), pro |
{##############################################################################} |
-{% block to_active_scriptwrappable %} |
-{% if active_scriptwrappable %} |
-ActiveScriptWrappable* {{v8_class}}::toActiveScriptWrappable(v8::Local<v8::Object> wrapper) |
-{ |
- return toImpl(wrapper); |
-} |
- |
-{% endif %} |
-{% endblock %} |
- |
- |
-{##############################################################################} |
{% block partial_interface %} |
{% if has_partial_interface %} |
InstallTemplateFunction {{v8_class}}::install{{v8_class}}TemplateFunction = (InstallTemplateFunction)&{{v8_class}}::install{{v8_class}}Template; |