AccessorConfiguration and AttributeConfiguration no longer need the same fields.

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

 {% from 'utilities.cpp.tmpl' import declare_enum_validation_variable, v8_value_to_local_cpp_value %}
 
 {##############################################################################}
 {% macro attribute_getter(attribute, world_suffix) %}
 static void {{attribute.name}}AttributeGetter{{world_suffix}}(
 {%- if attribute.is_data_type_property %}
 const v8::PropertyCallbackInfo<v8::Value>& info
 {%- else %}
 const v8::FunctionCallbackInfo<v8::Value>& info
 {%- endif %}) {
@@ skipping 390 matching lines @@
   {% endif %}
   {{attribute.cpp_setter}};
 
   {% if attribute.cached_attribute_validation_method %}
   // [CachedAttribute]
   // Invalidate the cached value.
   V8PrivateProperty::GetSymbol(
       isolate, "{{cpp_class}}#{{attribute.name.capitalize()}}")
       .DeleteProperty(holder, v8::Undefined(isolate));
   {% endif %}
+
+  {% if attribute.is_lazy_cached_accessor %}

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

Can we factor out these changes to a later CL?

[nverne, 2017/05/10 05:00:54]

Deleted this code. 

+  // Call cache init callback to store the correct private property.
+  {{attribute.name}}CacheInitCallback(info.GetIsolate(), holder);
+  {% endif %}
 }
 {% endfilter %}{# format_remove_duplicates #}
 {% endmacro %}
 
 
 {##############################################################################}
 {% macro attribute_setter_callback(attribute, world_suffix) %}
 void {{v8_class_or_partial}}::{{attribute.name}}AttributeSetterCallback{{world_suffix}}(
 {%- if attribute.is_data_type_property %}
 v8::Local<v8::Name>, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info
@@ skipping 41 matching lines @@
   {% elif attribute.has_cross_origin_setter %}
   {{cpp_class_or_partial}}V8Internal::{{attribute.name}}AttributeSetter(v8Value, V8CrossOriginSetterInfo(info.GetIsolate(), info.Holder()));
   {% else %}
   {{cpp_class_or_partial}}V8Internal::{{attribute.name}}AttributeSetter{{world_suffix}}(v8Value, info);
   {% endif %}
 }
 {% endmacro %}
 
 
 {##############################################################################}
-{% macro attribute_configuration(attribute) %}
+{% macro build_attribute_or_accessor_configuration(attribute, is_attribute_configuration) %}

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

For readability, avoid using a boolean type. You can use 'attribute' or
'accessor'.

[nverne, 2017/05/10 05:00:53]

Done

 {% from 'utilities.cpp.tmpl' import property_location %}
 {% if attribute.constructor_type %}
   {% if attribute.needs_constructor_getter_callback %}
     {% set getter_callback = '%s::%sConstructorGetterCallback' % (v8_class_or_partial, attribute.name) %}
   {% else %}
     {% set getter_callback = 'V8%s::NamedConstructorAttributeGetter' % (attribute.constructor_type)
        if attribute.is_named_constructor else 'V8ConstructorAttributeGetter' %}
   {% endif %}
 {% set setter_callback = 'nullptr' %}
 {% else %}{# regular attributes #}
 {% set getter_callback = '%s::%sAttributeGetterCallback' %
            (v8_class_or_partial, attribute.name) %}
 {% set setter_callback = '%s::%sAttributeSetterCallback' %
            (v8_class_or_partial, attribute.name)
            if attribute.has_setter else 'nullptr' %}
 {% endif %}
 {% set wrapper_type_info =
        'const_cast<WrapperTypeInfo*>(&V8%s::wrapperTypeInfo)' % attribute.constructor_type
        if attribute.constructor_type else 'nullptr' %}
 {% set property_attribute = 'static_cast<v8::PropertyAttribute>(%s)' %
                             ' | '.join(attribute.property_attributes) %}
-{% set cached_accessor_callback =
+{% set cached_property_key =
        '%s::%sCachedPropertyKey' % (v8_class_or_partial, attribute.name)
        if attribute.is_cached_accessor else
        'nullptr' %}
 {% set holder_check = 'V8DOMConfiguration::kDoNotCheckHolder'
        if attribute.is_lenient_this else 'V8DOMConfiguration::kCheckHolder' %}
 {% if attribute.is_per_world_bindings %}
 {% set getter_callback_for_main_world = '%sForMainWorld' % getter_callback %}
 {% set setter_callback_for_main_world =
        '%sForMainWorld' % setter_callback
        if attribute.has_setter else 'nullptr' %}
-{"{{attribute.name}}", {{getter_callback_for_main_world}}, {{setter_callback_for_main_world}}, {{cached_accessor_callback}}, {{wrapper_type_info}}, {{property_attribute}}, {{property_location(attribute)}}, {{holder_check}}, V8DOMConfiguration::kMainWorld},
-{"{{attribute.name}}", {{getter_callback}}, {{setter_callback}}, {{cached_accessor_callback}}, {{wrapper_type_info}}, {{property_attribute}}, {{property_location(attribute)}}, {{holder_check}}, V8DOMConfiguration::kNonMainWorlds}
-{%- else %}
-{"{{attribute.name}}", {{getter_callback}}, {{setter_callback}}, {{cached_accessor_callback}}, {{wrapper_type_info}}, {{property_attribute}}, {{property_location(attribute)}}, {{holder_check}}, V8DOMConfiguration::kAllWorlds}
-{%- endif %}
-{%- endmacro %}
+{% endif %}
+
+
+{% set config_pre = {

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

I'd prefer simply emitting the 6 patterns here instead of avoiding code
duplication using config_pre & config_post etc.

[nverne, 2017/05/10 05:00:53]

I think that's likely to be more confusing/error prone. We only one or two of
the six patterns, depending on the args passed in. 

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

+1 to merge some duplicates, but this implementation looks still
confusing... :(

+  "main" : [
+         '"%s"' % attribute.name,
+         getter_callback_for_main_world,
+         setter_callback_for_main_world,
+       ],
+  "non_main" : [
+         '"%s"' % attribute.name,
+         getter_callback,
+         setter_callback,
+       ],
+} %}
+
+{% set accessor_only_fields = [] if is_attribute_configuration else [
+      cached_property_key,
+] %}
+
+{% set config_post = [
+       wrapper_type_info,
+       property_attribute,
+       property_location(attribute),
+       holder_check,
+] %}
+
+{% if attribute.is_per_world_bindings %}
+  {% set main_config_list = config_pre["main"] + accessor_only_fields +
+      config_post + ['V8DOMConfiguration::kMainWorld'] %}
+  {% set non_main_config_list = config_pre["non_main"] + accessor_only_fields +
+      config_post + ['V8DOMConfiguration::kNonMainWorlds'] %}
+  {# Emit for main world then non-main.#}
+  {{'{'}}{{main_config_list | join(', ')}}{{'}'}}

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

no indentation is needed. it'll be adjusted by indent filters in caller side.

+  {{','}}

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

keep a comma at the tail of the previous line,
and it doesn't need {{' and '}}.

+  {{'{'}}{{non_main_config_list | join(', ')}}{{'}'}}
+{% else %}
+  {% set all_worlds_config_list = config_pre["non_main"] + accessor_only_fields +
+      config_post + ['V8DOMConfiguration::kAllWorlds'] %}
+  {# Emit only for all worlds #}
+  {{'{'}}{{all_worlds_config_list | join(', ')}}{{'}'}}

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

no indent

+{% endif %}
+{% endmacro %}
+
+{##############################################################################}
+{% macro attribute_configuration(attribute) %}
+{% set is_attribute_configuration = true %}
+{{build_attribute_or_accessor_configuration(attribute, is_attribute_configuration)}}
+{% endmacro %}
+
+{##############################################################################}
+{% macro accessor_configuration(attribute) %}
+{% set is_attribute_configuration = false %}
+{{build_attribute_or_accessor_configuration(attribute, is_attribute_configuration)}}
+{% endmacro %}
 
 {##############################################################################}
 {% macro install_conditionally_enabled_attributes_on_prototype() %}
 {% for attribute in attributes if (attribute.exposed_test or attribute.secure_context_test) and attribute.on_prototype %}
 {% filter exposed(attribute.exposed_test) %}
 {% filter secure_context(attribute.secure_context_test) %}
 {% filter runtime_enabled(attribute.runtime_enabled_feature_name) %}
 static const V8DOMConfiguration::AccessorConfiguration accessorConfiguration[] = {
-  {{attribute_configuration(attribute)}}
+  {{accessor_configuration(attribute)}}
 };
 for (const auto& accessorConfig : accessorConfiguration)
   V8DOMConfiguration::InstallAccessor(isolate, world, v8::Local<v8::Object>(), prototypeObject, interfaceObject, signature, accessorConfig);
 {% endfilter %}{# runtime_enabled #}
 {% endfilter %}{# secure_context #}
 {% endfilter %}{# exposed #}
 {% endfor %}
 {% endmacro %}