Allow origin trials to be declared on IDL operations (methods)

third_party/WebKit/Source/bindings/scripts/v8_methods.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 32 matching lines @@
                           is_legacy_interface_type_checking)
 
 
 # Methods with any of these require custom method registration code in the
 # interface's configure*Template() function.
 CUSTOM_REGISTRATION_EXTENDED_ATTRIBUTES = frozenset([
     'DoNotCheckSecurity',
 ])
 
 
+def method_is_visible(method, interface_is_partial):
+    if 'overloads' in method:
+        return method['overloads']['visible'] and not (method['overloads']['has_partial_overloads'] and interface_is_partial)
+    return method['visible'] and 'overload_index' not in method
+
+
+def conditionally_exposed(method):
+    return method['overloads']['exposed_test_all'] if 'overloads' in method else method['exposed_test']
+
+
+def filter_conditionally_exposed(methods, interface_is_partial):
+    return [method for method in methods if (
+        method_is_visible(method, interface_is_partial) and conditionally_exposed(method))]
+
+
+def custom_registration(method):
+    if 'overloads' in method:
+        return (method['overloads']['has_custom_registration_all'] or
+                method['overloads']['runtime_determined_lengths'] or
+                (method['overloads']['runtime_enabled_function_all'] and not conditionally_exposed(method)))
+    return (method['has_custom_registration'] or
+            (method['runtime_enabled_function'] and not conditionally_exposed(method)))
+
+
+def filter_custom_registration(methods, interface_is_partial):
+    return [method for method in methods if (
+        method_is_visible(method, interface_is_partial) and custom_registration(method))]
+
+
+def filter_method_configuration(methods, interface_is_partial):
+    return [method for method in methods if
+            method_is_visible(method, interface_is_partial) and
+            method['should_be_exposed_to_script'] and
+            not method['origin_trial_feature_name'] and
+            not conditionally_exposed(method) and
+            not custom_registration(method)]
+
+
+def method_for_origin_trial_feature(methods, feature_name, interface_is_partial):
+    """Filters the list of methods, and returns those defined for the named origin trial feature."""
+    return [method for method in methods if
+            method_is_visible(method, interface_is_partial) and
+            method['should_be_exposed_to_script'] and
+            method['origin_trial_feature_name'] == feature_name and
+            not conditionally_exposed(method) and
+            not custom_registration(method)]
+
+
+def method_filters():
+    return {'has_method_configuration': filter_method_configuration,
+            'custom_registration': filter_custom_registration,
+            'conditionally_exposed': filter_conditionally_exposed,
+            'method_for_origin_trial_feature': method_for_origin_trial_feature}

[haraken, 2016/06/29 04:05:28]

Nit: Alphabetical order.

[iclelland, 2016/06/29 05:04:20]

Done.

+
+
 def use_local_result(method):
     extended_attributes = method.extended_attributes
     idl_type = method.idl_type
     return (has_extended_attribute_value(method, 'CallWith', 'ScriptState') or
             'ImplementedInPrivateScript' in extended_attributes or
             'NewObject' in extended_attributes or
             'RaisesException' in extended_attributes or
             idl_type.is_union_type or
             idl_type.is_explicit_nullable)
 
 
 def method_context(interface, method, is_visible=True):
     arguments = method.arguments
     extended_attributes = method.extended_attributes
     idl_type = method.idl_type
     is_static = method.is_static
     name = method.name
 
-    # [OriginTrialEnabled]
-    # TODO(iclelland): Allow origin trials on methods
-    # (crbug.com/621641)
-    if v8_utilities.origin_trial_feature_name(method):
-        raise Exception('[OriginTrialEnabled] cannot be specified on '
-                        'individual methods: %s.%s' % (interface.name, method.name))
-
     if is_visible:
         idl_type.add_includes_for_type(extended_attributes)
 
     this_cpp_value = cpp_value(interface, method, len(arguments))
 
     is_implemented_in_private_script = 'ImplementedInPrivateScript' in extended_attributes
     if is_implemented_in_private_script:
         includes.add('bindings/core/v8/PrivateScriptRunner.h')
         includes.add('core/frame/LocalFrame.h')
         includes.add('platform/ScriptForbiddenScope.h')
@@ skipping 103 matching lines @@
             argument for argument in arguments
             if not (argument.is_optional or argument.is_variadic)]),
         'number_of_required_or_variadic_arguments': len([
             argument for argument in arguments
             if not argument.is_optional]),
         'on_instance': v8_utilities.on_instance(interface, method),
         'on_interface': v8_utilities.on_interface(interface, method),
         'on_prototype': v8_utilities.on_prototype(interface, method),
         'only_exposed_to_private_script': is_only_exposed_to_private_script,
         'origin_trial_enabled_function': v8_utilities.origin_trial_enabled_function_name(method),  # [OriginTrialEnabled]
+        'origin_trial_feature_name': v8_utilities.origin_trial_feature_name(method),  # [OriginTrialEnabled]
         'private_script_v8_value_to_local_cpp_value': idl_type.v8_value_to_local_cpp_value(
             extended_attributes, 'v8Value', 'cppValue', isolate='scriptState->isolate()', bailout_return_value='false'),
         'property_attributes': property_attributes(interface, method),
         'returns_promise': method.returns_promise,
         'runtime_enabled_function': v8_utilities.runtime_enabled_function_name(method),  # [RuntimeEnabled]
         'should_be_exposed_to_script': not (is_implemented_in_private_script and is_only_exposed_to_private_script),
         'use_output_parameter_for_result': idl_type.use_output_parameter_for_result,
         'use_local_result': use_local_result(method),
         'v8_set_return_value': v8_set_return_value(interface.name, method, this_cpp_value),
         'v8_set_return_value_for_main_world': v8_set_return_value(interface.name, method, this_cpp_value, for_main_world=True),
@@ skipping 260 matching lines @@
     return method.idl_type and method.idl_type.name == 'Promise'
 
 IdlOperation.returns_promise = property(method_returns_promise)
 
 
 def argument_conversion_needs_exception_state(method, argument):
     idl_type = argument.idl_type
     return (idl_type.v8_conversion_needs_exception_state or
             argument.is_variadic or
             (method.returns_promise and idl_type.is_string_type))