| Index: third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
|
| diff --git a/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl b/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
|
| index 439615c4fd15d94c5bc8da58f2282b87ca9c18db..d855596bf917855c5eb699bbfbe251a3ed794aa6 100644
|
| --- a/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
|
| +++ b/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
|
| @@ -9,13 +9,6 @@
|
|
|
| namespace blink {
|
| {% set dom_template = '%s::domTemplate' % v8_class if not is_array_buffer_or_view else '0' %}
|
| -{% set has_prepare_prototype_and_interface_object =
|
| - unscopables or has_conditional_attributes_on_prototype or
|
| - methods | conditionally_exposed(is_partial) %}
|
| -{% set prepare_prototype_and_interface_object_func =
|
| - '%s::preparePrototypeAndInterfaceObject' % v8_class
|
| - if has_prepare_prototype_and_interface_object
|
| - else 'nullptr' %}
|
| {% set parent_wrapper_type_info = '&V8%s::wrapperTypeInfo' % parent_interface
|
| if parent_interface else '0' %}
|
| {% set wrapper_type_prototype = 'WrapperTypeExceptionPrototype' if is_exception else
|
| @@ -33,7 +26,7 @@ namespace blink {
|
| #pragma clang diagnostic push
|
| #pragma clang diagnostic ignored "-Wglobal-constructors"
|
| #endif
|
| -{{wrapper_type_info_const}}WrapperTypeInfo {{v8_class}}::wrapperTypeInfo = { gin::kEmbedderBlink, {{dom_template}}, {{v8_class}}::trace, {{v8_class}}::traceWrappers, {{prepare_prototype_and_interface_object_func}}, "{{interface_name}}", {{parent_wrapper_type_info}}, WrapperTypeInfo::{{wrapper_type_prototype}}, WrapperTypeInfo::{{wrapper_class_id}}, WrapperTypeInfo::{{active_scriptwrappable_inheritance}}, WrapperTypeInfo::{{lifetime}} };
|
| +{{wrapper_type_info_const}}WrapperTypeInfo {{v8_class}}::wrapperTypeInfo = { gin::kEmbedderBlink, {{dom_template}}, {{v8_class}}::trace, {{v8_class}}::traceWrappers, {{prepare_prototype_and_interface_object_func or 'nullptr'}}, "{{interface_name}}", {{parent_wrapper_type_info}}, WrapperTypeInfo::{{wrapper_type_prototype}}, WrapperTypeInfo::{{wrapper_class_id}}, WrapperTypeInfo::{{active_scriptwrappable_inheritance}}, WrapperTypeInfo::{{lifetime}} };
|
| #if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG)
|
| #pragma clang diagnostic pop
|
| #endif
|
| @@ -709,7 +702,7 @@ void {{v8_class_or_partial}}::install{{feature.name}}(ScriptState* scriptState)
|
| {% block prepare_prototype_and_interface_object %}
|
| {% from 'attributes.cpp.tmpl' import install_conditionally_enabled_attributes_on_prototype with context %}
|
| {% from 'methods.cpp.tmpl' import install_conditionally_enabled_methods with context %}
|
| -{% if has_prepare_prototype_and_interface_object %}
|
| +{% if prepare_prototype_and_interface_object_func %}
|
| void {{v8_class_or_partial}}::preparePrototypeAndInterfaceObject(v8::Local<v8::Context> context, const DOMWrapperWorld& world, v8::Local<v8::Object> prototypeObject, v8::Local<v8::Function> interfaceObject, v8::Local<v8::FunctionTemplate> interfaceTemplate) {
|
| {% if is_partial %}
|
| {{v8_class}}::preparePrototypeAndInterfaceObject(context, world, prototypeObject, interfaceObject, interfaceTemplate);
|
|
|