IDL compiler: [ActivityLogging] for setters

Source/bindings/scripts/unstable/v8_attributes.py

 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 53 matching lines @@
     }
 
 
 def generate_attribute_and_includes(interface, attribute):
     idl_type = attribute.data_type
     extended_attributes = attribute.extended_attributes
 
     has_custom_getter = has_extended_attribute(attribute, ('Custom', 'CustomGetter'))
     has_setter = not attribute.is_read_only  # FIXME: support [PutForwards], [Reflect], and [Replaceable]
     has_custom_setter = has_setter and has_extended_attribute(attribute, ('Custom', 'CustomSetter'))
+    includes = set()
     contents = {
         'access_control_list': access_control_list(attribute),
+        'activity_logging_world_list_for_getter': v8_utilities.activity_logging_world_list(attribute, includes, 'Getter'),  # [ActivityLogging]
+        'activity_logging_world_list_for_setter': v8_utilities.activity_logging_world_list(attribute, includes, 'Setter'),  # [ActivityLogging]
         'cached_attribute_validation_method': extended_attributes.get('CachedAttribute'),
         'conditional_string': v8_utilities.generate_conditional_string(attribute),
         'cpp_type': v8_types.cpp_type(idl_type),
         'getter_callback_name': getter_callback_name(interface, attribute),
         'getter_callback_name_for_main_world': getter_callback_name_for_main_world(interface, attribute),
         'has_custom_getter': has_custom_getter,
         'has_custom_setter': has_custom_setter,
         'has_setter': has_setter,
         'idl_type': idl_type,
         'is_getter_raises_exception': has_extended_attribute(attribute, ('GetterRaisesException', 'RaisesException')),
         'is_keep_alive_for_gc': is_keep_alive_for_gc(attribute),
         'is_nullable': attribute.is_nullable,
         'is_static': attribute.is_static,
         'name': attribute.name,
         'per_context_enabled_function_name': v8_utilities.per_context_enabled_function_name(attribute),  # [PerContextEnabled]
         'property_attributes': property_attributes(attribute),
         'setter_callback_name': setter_callback_name(interface, attribute),
         'setter_callback_name_for_main_world': setter_callback_name_for_main_world(interface, attribute),
         'v8_type': v8_types.v8_type(idl_type),
         'runtime_enabled_function_name': v8_utilities.runtime_enabled_function_name(attribute),  # [RuntimeEnabled]
         'world_suffixes': ['', 'ForMainWorld'] if 'PerWorldBindings' in extended_attributes else [''],  # [PerWorldBindings]
     }
-    includes = set()
     if not has_custom_getter:
         generate_getter(interface, attribute, contents, includes)
     if has_setter and not has_custom_setter:
         generate_setter(interface, attribute, contents, includes)
 
     return contents, includes
 
 
 def generate_getter(interface, attribute, contents, includes):
     idl_type = attribute.data_type
@@ skipping 33 matching lines @@
         includes.add('bindings/v8/BindingSecurity.h')
     v8_utilities.generate_measure_as(attribute, contents, includes)  # [MeasureAs]
 
     # [DeprecateAs]
     v8_utilities.generate_deprecate_as(attribute, contents, includes)
     if is_check_security_for_node or contents['is_getter_raises_exception']:
         includes.update(set(['bindings/v8/ExceptionMessages.h',
                              'bindings/v8/ExceptionState.h']))
 
     contents.update({
-        'activity_logging_getter': v8_utilities.has_activity_logging(attribute, includes, 'Getter'),  # [ActivityLogging]
         'is_check_security_for_node': is_check_security_for_node,
         'is_unforgeable': 'Unforgeable' in extended_attributes,
     })
 
 
 def getter_expression(interface, attribute, contents, includes):
     arguments = []
     if 'Reflect' in attribute.extended_attributes:
         getter_base_name = content_attribute_getter_base_name(attribute, includes, arguments)
     else:
@@ skipping 38 matching lines @@
     return 'fastGetAttribute'
 
 
 def generate_setter(interface, attribute, contents, includes):
     idl_type = attribute.data_type
     if v8_types.is_interface_type(idl_type) and not v8_types.array_type(idl_type):
         cpp_value = 'WTF::getPtr(cppValue)'
     else:
         cpp_value = 'cppValue'
     contents.update({
-        'v8_value_to_local_cpp_value': v8_types.v8_value_to_local_cpp_value(idl_type, attribute.extended_attributes, 'jsValue', 'cppValue', includes, 'info.GetIsolate()'),
         'cpp_setter': setter_expression(interface, attribute, contents),
         'enum_validation_expression': enum_validation_expression(idl_type),
+        'v8_value_to_local_cpp_value': v8_types.v8_value_to_local_cpp_value(idl_type, attribute.extended_attributes, 'jsValue', 'cppValue', includes, 'info.GetIsolate()'),
     })
 
 
 def setter_expression(interface, attribute, contents):
     arguments = v8_utilities.call_with_arguments(attribute, contents)
     idl_type = attribute.data_type
     # FIXME: should be able to eliminate WTF::getPtr in most or all cases
     cpp_value = 'WTF::getPtr(cppValue)' if v8_types.is_interface_type(idl_type) and not v8_types.array_type(idl_type) else 'cppValue'
     arguments.append(cpp_value)
     setter_name = scoped_name(interface, attribute, 'set%s' % capitalize(cpp_name(attribute)))
@@ skipping 77 matching lines @@
     if 'PerWorldBindings' not in attribute.extended_attributes:
         return '0'
     return '%sV8Internal::%sAttributeGetterCallbackForMainWorld' % (cpp_name(interface), attribute.name)
 
 
 def setter_callback_name_for_main_world(interface, attribute):
     if ('PerWorldBindings' not in attribute.extended_attributes or
         attribute.is_read_only):
         return '0'
     return '%sV8Internal::%sAttributeSetterCallbackForMainWorld' % (cpp_name(interface), attribute.name)