Index: third_party/WebKit/Source/bindings/scripts/v8_attributes.py |
diff --git a/third_party/WebKit/Source/bindings/scripts/v8_attributes.py b/third_party/WebKit/Source/bindings/scripts/v8_attributes.py |
index c5f7d66be94431be535f40ab9f9df9facf28fe0a..5f066fb3c926b3fe8901acf67fb29ce2a088a59d 100644 |
--- a/third_party/WebKit/Source/bindings/scripts/v8_attributes.py |
+++ b/third_party/WebKit/Source/bindings/scripts/v8_attributes.py |
@@ -94,7 +94,7 @@ def attribute_context(interface, attribute): |
if cached_attribute_validation_method or keep_alive_for_gc: |
includes.add('bindings/core/v8/V8HiddenValue.h') |
- if 'APIExperimentEnabled' in extended_attributes: |
+ if 'OriginTrialEnabled' in extended_attributes: |
includes.add('core/inspector/ConsoleMessage.h') |
includes.add('core/origin_trials/OriginTrials.h') |
@@ -103,9 +103,9 @@ def attribute_context(interface, attribute): |
'activity_logging_world_list_for_getter': v8_utilities.activity_logging_world_list(attribute, 'Getter'), # [ActivityLogging] |
'activity_logging_world_list_for_setter': v8_utilities.activity_logging_world_list(attribute, 'Setter'), # [ActivityLogging] |
'activity_logging_world_check': v8_utilities.activity_logging_world_check(attribute), # [ActivityLogging] |
- 'api_experiment_enabled': v8_utilities.api_experiment_enabled_function(attribute), # [APIExperimentEnabled] |
- 'api_experiment_enabled_per_interface': v8_utilities.api_experiment_enabled_function(interface), # [APIExperimentEnabled] |
- 'api_experiment_name': extended_attributes.get('APIExperimentEnabled'), # [APIExperimentEnabled] |
+ 'origin_trial_enabled': v8_utilities.origin_trial_enabled_function(attribute), # [OriginTrialEnabled] |
haraken
2016/02/11 05:46:56
Alphabetical order please. (The same comment for o
iclelland
2016/02/11 15:21:57
Thanks - I missed that. I have moved these ones in
|
+ 'origin_trial_enabled_per_interface': v8_utilities.origin_trial_enabled_function(interface), # [OriginTrialEnabled] |
+ 'origin_trial_name': extended_attributes.get('OriginTrialEnabled'), # [OriginTrialEnabled] |
'argument_cpp_type': idl_type.cpp_type_args(used_as_rvalue_type=True), |
'cached_attribute_validation_method': cached_attribute_validation_method, |
'constructor_type': constructor_type, |
@@ -120,7 +120,7 @@ def attribute_context(interface, attribute): |
'has_custom_setter': has_custom_setter(attribute), |
'has_setter': has_setter(attribute), |
'idl_type': str(idl_type), # need trailing [] on array for Dictionary::ConversionContext::setConversionType |
- 'is_api_experiment_enabled': v8_utilities.api_experiment_enabled_function(attribute) or v8_utilities.api_experiment_enabled_function(interface), # [APIExperimentEnabled] |
+ 'is_origin_trial_enabled': v8_utilities.origin_trial_enabled_function(attribute) or v8_utilities.origin_trial_enabled_function(interface), # [OriginTrialEnabled] |
'is_call_with_execution_context': has_extended_attribute_value(attribute, 'CallWith', 'ExecutionContext'), |
'is_call_with_script_state': has_extended_attribute_value(attribute, 'CallWith', 'ScriptState'), |
'is_check_security_for_receiver': is_check_security_for_receiver, |
@@ -512,7 +512,7 @@ def is_constructor_attribute(attribute): |
def update_constructor_attribute_context(interface, attribute, context): |
- context['needs_constructor_getter_callback'] = context['measure_as'] or context['deprecate_as'] or context['api_experiment_name'] |
+ context['needs_constructor_getter_callback'] = context['measure_as'] or context['deprecate_as'] or context['origin_trial_name'] |
# When the attribute name is the same as the interface name, do not generate |
# callback functions for each attribute and use |
# {{cpp_class}}ConstructorAttributeSetterCallback. Otherwise, generate |