AccessorConfiguration and AttributeConfiguration no longer need the same fields.

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

 {% filter format_blink_cpp_source_code %}
 
 {% 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 {
@@ skipping 59 matching lines @@
 {% if not is_array_buffer_or_view %}
 namespace {{cpp_class_or_partial}}V8Internal {
 {% if has_partial_interface %}
 {% for method in methods if method.overloads and method.overloads.has_partial_overloads %}
 static void (*{{method.name}}MethodForPartialInterface)(const v8::FunctionCallbackInfo<v8::Value>&) = 0;
 {% endfor %}
 {% endif %}
 
 {##############################################################################}
 {# Attributes #}
-{% from 'attributes.cpp.tmpl' import attribute_getter, attribute_setter with context %}
+{% from 'attributes.cpp.tmpl' import attribute_getter,
+       attribute_setter,
+       with context %}
 {% for attribute in attributes %}
 {% for world_suffix in attribute.world_suffixes %}
 {% if not attribute.has_custom_getter and not attribute.constructor_type %}
 {{attribute_getter(attribute, world_suffix)}}
 {% endif %}
 {% if attribute.has_setter and not attribute.has_custom_setter %}
 {{attribute_setter(attribute, world_suffix)}}
 {% endif %}
 {% endfor %}
 {% endfor %}
@@ skipping 271 matching lines @@
     {% endfor %}
 };
 #if defined(COMPONENT_BUILD) && defined(WIN32) && COMPILER(CLANG)
 #pragma clang diagnostic pop
 #endif
 
 {% endif %}
 {% endblock %}
 {##############################################################################}
 {% block install_accessors %}
-{% from 'attributes.cpp.tmpl' import attribute_configuration with context %}
+{% from 'attributes.cpp.tmpl' import accessor_configuration with context %}
 {% if accessors %}
 static const V8DOMConfiguration::AccessorConfiguration {{v8_class}}Accessors[] = {
     {% for accessor in accessors %}
-    {{attribute_configuration(accessor) | indent(4)}},
+    {{accessor_configuration(accessor) | indent(4)}},
     {% endfor %}
 };
 
 {% endif %}
 {% endblock %}
 {##############################################################################}
 {% block install_methods %}
 {% from 'methods.cpp.tmpl' import method_configuration with context %}
 {% if methods | has_method_configuration(is_partial) %}
 static const V8DOMConfiguration::MethodConfiguration {{v8_class}}Methods[] = {
     {% for method in methods | has_method_configuration(is_partial) %}
     {{method_configuration(method) | indent(4)}},
     {% endfor %}
 };
 
 {% endif %}
 {% endblock %}
 {% endif %}{# not is_array_buffer_or_view #}
 {##############################################################################}
 {% block named_constructor %}{% endblock %}
 {% block constructor_callback %}{% endblock %}
 {##############################################################################}
 {% block install_dom_template %}
 {% if not is_array_buffer_or_view %}
 {% from 'methods.cpp.tmpl' import install_custom_signature with context %}
-{% from 'attributes.cpp.tmpl' import attribute_configuration with context %}
+{% from 'attributes.cpp.tmpl' import accessor_configuration,
+        attribute_configuration,
+        with context %}
 {% from 'constants.cpp.tmpl' import install_constants with context %}
 {% from 'methods.cpp.tmpl' import method_configuration with context %}
 {% if has_partial_interface or is_partial %}
 void {{v8_class_or_partial}}::install{{v8_class}}Template(v8::Isolate* isolate, const DOMWrapperWorld& world, v8::Local<v8::FunctionTemplate> interfaceTemplate) {
 {% else %}
 static void install{{v8_class}}Template(v8::Isolate* isolate, const DOMWrapperWorld& world, v8::Local<v8::FunctionTemplate> interfaceTemplate) {
 {% endif %}
   // Initialize the interface object's template.
   {% if is_partial %}
   {{v8_class}}::install{{v8_class}}Template(isolate, world, interfaceTemplate);
@@ skipping 68 matching lines @@
   {% filter runtime_enabled(feature_name) %}
   {% for attribute in attribute_list | unique_by('name') | sort %}
   {% if attribute.is_data_type_property %}
   static const V8DOMConfiguration::AttributeConfiguration attribute{{attribute.name}}Configuration[] = {
     {{attribute_configuration(attribute) | indent(2)}}
   };
   for (const auto& attributeConfig : attribute{{attribute.name}}Configuration)
     V8DOMConfiguration::InstallAttribute(isolate, world, instanceTemplate, prototypeTemplate, attributeConfig);
   {% else %}
   static const V8DOMConfiguration::AccessorConfiguration accessor{{attribute.name}}Configuration[] = {
-    {{attribute_configuration(attribute) | indent(2)}}
+    {{accessor_configuration(attribute) | indent(2)}}
   };
   for (const auto& accessorConfig : accessor{{attribute.name}}Configuration)
     V8DOMConfiguration::InstallAccessor(isolate, world, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, accessorConfig);
   {% endif %}
   {% endfor %}
   {% endfilter %}
   {% endfor %}
 
   {% if (indexed_property_getter or named_property_getter) and not is_partial %}
   // Indexed properties
@@ skipping 107 matching lines @@
   {% endfilter %}
   {% endfor %}
   {% endif %}
 }
 
 {% endif %}{# not is_array_buffer_or_view #}
 {% endblock %}
 {##############################################################################}
 {% block install_runtime_enabled %}
 {% if needs_runtime_enabled_installer %}
-{% from 'attributes.cpp.tmpl' import attribute_configuration with context %}
+{% from 'attributes.cpp.tmpl' import accessor_configuration,
+        attribute_configuration,
+        with context %}
 {% from 'methods.cpp.tmpl' import install_custom_signature with context %}
 void {{v8_class_or_partial}}::installRuntimeEnabledFeatures(v8::Isolate* isolate, const DOMWrapperWorld& world, v8::Local<v8::Object> instance, v8::Local<v8::Object> prototype, v8::Local<v8::Function> interface) {
   {% if runtime_enabled_feature_name %}
 #error "We don't expect a runtime enabled interface {{v8_class_or_partial}} to have installRuntimeEnabledFeatures()."
   {% endif %}
 
   {% if is_partial %}
   {{v8_class}}::installRuntimeEnabledFeatures(isolate, world, instance, prototype, interface);
   {% endif %}
 
   v8::Local<v8::FunctionTemplate> interfaceTemplate = {{v8_class}}::wrapperTypeInfo.domTemplate(isolate, world);
   v8::Local<v8::Signature> signature = v8::Signature::New(isolate, interfaceTemplate);
   ALLOW_UNUSED_LOCAL(signature);
 
   {# TODO(peria): Generate code to install constants. It depends on runtime_enabled_feaure of this interface. #}
 
   {% for feature_name, attrs in runtime_enabled_attributes | groupby('runtime_enabled_feature_name') %}
   {% filter runtime_enabled(feature_name) %}
   {% for attribute in attrs | unique_by('name') | sort %}
   {% if attribute.is_data_type_property %}
   static const V8DOMConfiguration::AttributeConfiguration attribute{{attribute.name}}Configuration[] = {
     {{attribute_configuration(attribute) | indent(2)}}
   };
   for (const auto& attributeConfig : attribute{{attribute.name}}Configuration)
     V8DOMConfiguration::InstallAttribute(isolate, world, instance, prototype, attributeConfig);
   {% else %}
   static const V8DOMConfiguration::AccessorConfiguration accessor{{attribute.name}}Configuration[] = {
-    {{attribute_configuration(attribute) | indent(2)}}
+    {{accessor_configuration(attribute) | indent(2)}}
   };
   for (const auto& accessorConfig : accessor{{attribute.name}}Configuration)
     V8DOMConfiguration::InstallAccessor(isolate, world, instance, prototype, interface, signature, accessorConfig);
   {% endif %}
   {% endfor %}
   {% endfilter %}
   {% endfor %}
 
   {% if iterator_method and iterator_method.runtime_enabled_feature_name %}
   {% filter exposed(iterator_method.exposed_test) %}
@@ skipping 21 matching lines @@
   {% endif %}
   {% endfilter %}
   {% endfor %}
   {% endif %}
 }
 
 {% endif %}{# needs_runtime_enabled_installer #}
 {% endblock %}
 {##############################################################################}
 {% block origin_trials %}
-{% from 'attributes.cpp.tmpl' import attribute_configuration with context %}
+{% from 'attributes.cpp.tmpl' import accessor_configuration,
+        attribute_configuration,
+        with context %}
 {% from 'constants.cpp.tmpl' import constant_configuration with context %}
 {% from 'methods.cpp.tmpl' import method_configuration with context %}
 {% for feature in origin_trial_features %}
 void {{v8_class_or_partial}}::install{{feature.name}}(v8::Isolate* isolate, const DOMWrapperWorld& world, v8::Local<v8::Object> instance, v8::Local<v8::Object> prototype, v8::Local<v8::Function> interface) {
   {% if feature.attributes or feature.methods %}
   v8::Local<v8::FunctionTemplate> interfaceTemplate = {{v8_class}}::wrapperTypeInfo.domTemplate(isolate, world);
   v8::Local<v8::Signature> signature = v8::Signature::New(isolate, interfaceTemplate);
   ALLOW_UNUSED_LOCAL(signature);
   {% endif %}
   {# Origin-Trial-enabled attributes #}
   {% for attribute in feature.attributes %}
   {% if attribute.is_data_type_property %}
   static const V8DOMConfiguration::AttributeConfiguration attribute{{attribute.name}}Configuration[] = {
     {{attribute_configuration(attribute) | indent(2)}}
   };
   for (const auto& attributeConfig : attribute{{attribute.name}}Configuration)
     V8DOMConfiguration::InstallAttribute(isolate, world, instance, prototype, attributeConfig);
   {% else %}
   static const V8DOMConfiguration::AccessorConfiguration accessor{{attribute.name}}Configuration[] = {
-    {{attribute_configuration(attribute) | indent(2)}}
+    {{accessor_configuration(attribute) | indent(2)}}

[haraken, 2017/05/10 04:21:13]

Not related to this CL, 'accessor', 'attribute' and 'data property' are used
randomly in the code base, which is really confusing. We should rename them...

[peria, 2017/05/10 05:20:50]

We have to decide the naming rule about this confusing before renaming.
- IDL files describe 'attributes'.
- Web IDL spec says attributes should be exposed as 'accessor properties' in ES.
- Blink expose some attributes as 'data properties'.
So I feel it not clear which name should be used in the bindings layer of Blink.

   };
   for (const auto& accessorConfig : accessor{{attribute.name}}Configuration)
     V8DOMConfiguration::InstallAccessor(isolate, world, instance, prototype, interface, signature, accessorConfig);
   {% endif %}
   {% endfor %}
   {# Origin-Trial-enabled constants #}
   {% for constant in feature.constants %}
   {% set constant_name = constant.name.title().replace('_', '') %}
   const V8DOMConfiguration::ConstantConfiguration constant{{constant_name}}Configuration = {{constant_configuration(constant)}};
   V8DOMConfiguration::InstallConstant(isolate, interface, prototype, constant{{constant_name}}Configuration);
@@ skipping 71 matching lines @@
 {% endif %}
 }
 {% endif %}
 
 {% endblock %}
 {##############################################################################}
 {% block partial_interface %}{% endblock %}
 }  // namespace blink
 
 {% endfilter %}{# format_blink_cpp_source_code #}