Support combination of [OriginTrialEnabled] and [SecureContext]

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 31 matching lines @@
 from v8_utilities import (has_extended_attribute_value, is_unforgeable,
                           is_legacy_interface_type_checking)
 
 
 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):
+def is_origin_trial_enabled(method):
+    return bool(method['origin_trial_feature_name'])
+
+
+def is_conditionally_enabled(method):
     exposed = method['overloads']['exposed_test_all'] if 'overloads' in method else method['exposed_test']
     secure_context = method['overloads']['secure_context_test_all'] if 'overloads' in method else method['secure_context_test']
     return exposed or secure_context
 
 
-def filter_conditionally_exposed(methods, interface_is_partial):
+def filter_conditionally_enabled(methods, interface_is_partial):
     return [method for method in methods if (
-        method_is_visible(method, interface_is_partial) and conditionally_exposed(method))]
+        method_is_visible(method, interface_is_partial) and
+        is_conditionally_enabled(method) and
+        not is_origin_trial_enabled(method))]
 
 
 def custom_registration(method):
     # TODO(dcheng): Currently, bindings must create a function object for each
     # realm as a hack to support the incumbent realm. Remove the need for custom
     # registration when Blink properly supports the incumbent realm.
     if method['is_cross_origin']:
         return True
     if 'overloads' in method:
         return (method['overloads']['runtime_determined_lengths'] or
-                (method['overloads']['runtime_enabled_all'] and not conditionally_exposed(method)))
-    return method['runtime_enabled_feature_name'] and not conditionally_exposed(method)
+                (method['overloads']['runtime_enabled_all'] and not is_conditionally_enabled(method)))
+    return method['runtime_enabled_feature_name'] and not is_conditionally_enabled(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
-            not method['origin_trial_feature_name'] and
-            not conditionally_exposed(method) and
+            not is_origin_trial_enabled(method) and
+            not is_conditionally_enabled(method) and
             not custom_registration(method)]
 
 
 def method_filters():
-    return {'conditionally_exposed': filter_conditionally_exposed,
-            'custom_registration': filter_custom_registration,
+    return {'custom_registration': filter_custom_registration,
             'has_method_configuration': filter_method_configuration}
 
 
 def use_local_result(method):
     extended_attributes = method.extended_attributes
     idl_type = method.idl_type
     return (has_extended_attribute_value(method, 'CallWith', 'ScriptState') or
             'NewObject' in extended_attributes or
             'RaisesException' in extended_attributes or
             idl_type.is_union_type or
@@ skipping 382 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))