Clean up V8 bindings template code

third_party/WebKit/Source/bindings/templates/interface_base.cpp

 {% include 'copyright_block.txt' %}
 #include "{{v8_class_or_partial}}.h"
 
 {% for filename in cpp_includes if filename != '%s.h' % cpp_class_or_partial %}
 #include "{{filename}}"
 {% endfor %}
 
 namespace blink {
 {% set to_active_scriptwrappable = '%s::toActiveScriptWrappable' % v8_class
                                    if active_scriptwrappable else '0' %}
@@ skipping 102 matching lines @@
 
 {% endif %}
 {% endblock %}
 {##############################################################################}
 {# Methods #}
 {% from 'methods.cpp' import generate_method, overload_resolution_method,
        method_callback, origin_safe_method_getter, generate_constructor,
        method_implemented_in_private_script, generate_post_message_impl,
        runtime_determined_length_method, runtime_determined_maxarg_method
        with context %}
-{% for method in methods %}
-{% if method.should_be_exposed_to_script %}
+{% for method in methods if method.should_be_exposed_to_script %}
 {% for world_suffix in method.world_suffixes %}
 {% if not method.is_custom and not method.is_post_message and method.visible %}
 {{generate_method(method, world_suffix)}}
 {% endif %}
 {% if method.is_post_message %}
 {{generate_post_message_impl()}}
 {% endif %}
 {% if method.overloads and method.overloads.visible %}
 {% if method.overloads.runtime_determined_lengths %}
 {{runtime_determined_length_method(method.overloads)}}
@@ skipping 11 matching lines @@
       (not method.overloads and method.visible) %}
 {# A single callback is generated for overloaded methods #}
 {# with considering partial overloads #}
 {{method_callback(method, world_suffix)}}
 {% endif %}
 {% endif %}
 {% if method.is_do_not_check_security and method.visible %}
 {{origin_safe_method_getter(method, world_suffix)}}
 {% endif %}
 {% endfor %}
-{% endif %}
 {% endfor %}
 {% if iterator_method %}
 {{generate_method(iterator_method)}}
 {{method_callback(iterator_method)}}
 {% endif %}
 {% block origin_safe_method_setter %}{% endblock %}
 {# Constructors #}
 {% for constructor in constructors %}
 {{generate_constructor(constructor)}}
 {% endfor %}
@@ skipping 15 matching lines @@
 {% block named_property_deleter %}{% endblock %}
 {% block named_property_deleter_callback %}{% endblock %}
 {% block named_property_enumerator %}{% endblock %}
 {% block named_property_enumerator_callback %}{% endblock %}
 } // namespace {{cpp_class_or_partial}}V8Internal
 
 {% block visit_dom_wrapper %}{% endblock %}
 {##############################################################################}
 {% block install_attributes %}
 {% from 'attributes.cpp' import attribute_configuration with context %}
-{% if has_attribute_configuration %}
+{% if attributes | has_attribute_configuration %}
 // Suppress warning: global constructors, because AttributeConfiguration 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 V8DOMConfiguration::AttributeConfiguration {{v8_class}}Attributes[] = {
-    {% for attribute in attributes
-       if not (attribute.exposed_test or
-               attribute.runtime_enabled_function) and
-          attribute.is_data_type_property and
-          attribute.should_be_exposed_to_script %}
+    {% for attribute in attributes | has_attribute_configuration %}
     {{attribute_configuration(attribute)}},
     {% endfor %}
 };
 #if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG)
 #pragma clang diagnostic pop
 #endif
 
 {% endif %}
 {% endblock %}
 {##############################################################################}
 {% block install_accessors %}
 {% from 'attributes.cpp' import attribute_configuration with context %}
-{% if has_accessor_configuration %}
+{% if attributes | has_accessor_configuration %}
 const V8DOMConfiguration::AccessorConfiguration {{v8_class}}Accessors[] = {
-    {% for attribute in attributes
-       if not (attribute.exposed_test or
-               attribute.runtime_enabled_function) and
-          not attribute.is_data_type_property and
-          attribute.should_be_exposed_to_script %}
+    {% for attribute in attributes | has_accessor_configuration %}
     {{attribute_configuration(attribute)}},
     {% endfor %}
 };
 
 {% endif %}
 {% endblock %}
 {##############################################################################}
 {% block install_methods %}
 {% from 'methods.cpp' import method_configuration with context %}
 {% if method_configuration_methods %}
@@ skipping 43 matching lines @@
     v8::Local<v8::ObjectTemplate> instanceTemplate = interfaceTemplate->InstanceTemplate();
     ALLOW_UNUSED_LOCAL(instanceTemplate);
     v8::Local<v8::ObjectTemplate> prototypeTemplate = interfaceTemplate->PrototypeTemplate();
     ALLOW_UNUSED_LOCAL(prototypeTemplate);
 
     {%- if interface_name == 'Window' and not is_partial %}{{newline}}
     prototypeTemplate->SetInternalFieldCount(V8Window::internalFieldCount);
     {% endif %}
 
     // Register DOM constants, attributes and operations.
-    {% if runtime_enabled_function %}
-    if ({{runtime_enabled_function}}()) {
-    {% endif %}
-    {% filter indent(4 if runtime_enabled_function else 0, true) %}
+    {% filter runtime_enabled(runtime_enabled_function) %}
     {% if constants %}
     {{install_constants() | indent}}
     {% endif %}
-    {% if has_attribute_configuration %}
+    {% if attributes | has_attribute_configuration %}
     V8DOMConfiguration::installAttributes(isolate, world, instanceTemplate, prototypeTemplate, {{'%sAttributes' % v8_class}}, {{'WTF_ARRAY_LENGTH(%sAttributes)' % v8_class}});
     {% endif %}
-    {% if has_accessor_configuration %}
+    {% if attributes | has_accessor_configuration %}
     V8DOMConfiguration::installAccessors(isolate, world, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, {{'%sAccessors' % v8_class}}, {{'WTF_ARRAY_LENGTH(%sAccessors)' % v8_class}});
     {% endif %}
     {% if method_configuration_methods %}
     V8DOMConfiguration::installMethods(isolate, world, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, {{'%sMethods' % v8_class}}, {{'WTF_ARRAY_LENGTH(%sMethods)' % v8_class}});
     {% endif %}
-    {% endfilter %}{{newline}}
-    {% if runtime_enabled_function %}
-    } // if ({{runtime_enabled_function}}())
-    {% endif %}
-
+    {% endfilter %}
     {%- if has_access_check_callbacks and not is_partial %}{{newline}}
     // Cross-origin access check
     instanceTemplate->SetAccessCheckCallback({{cpp_class}}V8Internal::securityCheck, v8::External::New(isolate, const_cast<WrapperTypeInfo*>(&{{v8_class}}::wrapperTypeInfo)));
     {% endif %}
 
     {%- if has_array_iterator and not is_partial and not is_global %}{{newline}}
     // Array iterator
     prototypeTemplate->SetIntrinsicDataProperty(v8::Symbol::GetIterator(isolate), v8::kArrayProto_values, v8::DontEnum);
     {% endif %}
 
-    {%- set runtime_enabled_features = dict() %}
-    {% for attribute in attributes
-       if attribute.runtime_enabled_function and
-          not attribute.exposed_test %}
-        {% if attribute.runtime_enabled_function not in runtime_enabled_features %}
-            {% set unused = runtime_enabled_features.update({attribute.runtime_enabled_function: []}) %}
-        {% endif %}
-        {% set unused = runtime_enabled_features.get(attribute.runtime_enabled_function).append(attribute) %}
-    {% endfor %}
-    {% for runtime_enabled_feature in runtime_enabled_features | sort %}{{newline}}
-    if ({{runtime_enabled_feature}}()) {
-        {% set distinct_attributes = [] %}
-        {% for attribute in runtime_enabled_features.get(runtime_enabled_feature) | sort
-           if attribute.name not in distinct_attributes %}
-        {% set unused = distinct_attributes.append(attribute.name) %}
+    {%- for group in attributes | runtime_enabled_attributes | groupby('runtime_feature_name') %}{{newline}}
+    if ({{group.list[0].runtime_enabled_function}}()) {
+        {% for attribute in group.list | unique_by('name') | sort %}
         {% if attribute.is_data_type_property %}
         const V8DOMConfiguration::AttributeConfiguration attribute{{attribute.name}}Configuration = \
         {{attribute_configuration(attribute)}};
         V8DOMConfiguration::installAttribute(isolate, world, instanceTemplate, prototypeTemplate, attribute{{attribute.name}}Configuration);
         {% else %}
         const V8DOMConfiguration::AccessorConfiguration accessor{{attribute.name}}Configuration = \
         {{attribute_configuration(attribute)}};
         V8DOMConfiguration::installAccessor(isolate, world, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, accessor{{attribute.name}}Configuration);
         {% endif %}
         {% endfor %}
@@ skipping 65 matching lines @@
 {{method_implemented_in_private_script(method)}}
 {% endfor %}
 {% for attribute in attributes if attribute.is_implemented_in_private_script %}
 {{attribute_getter_implemented_in_private_script(attribute)}}
 {% if attribute.has_setter %}
 {{attribute_setter_implemented_in_private_script(attribute)}}
 {% endif %}
 {% endfor %}
 {% block partial_interface %}{% endblock %}
 } // namespace blink