Support combination of [OriginTrialEnabled] and [SecureContext]

third_party/WebKit/Source/bindings/scripts/v8_utilities.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 371 matching lines @@
     return None
 
 
 # [OriginTrialEnabled]
 def origin_trial_enabled_function_name(definition_or_member):
     """Returns the name of the OriginTrials enabled function.
 
     An exception is raised if OriginTrialEnabled is used in conjunction with any
     of the following (which must be mutually exclusive with origin trials):
       - RuntimeEnabled
-      - SecureContext
 
     The returned function checks if the IDL member should be enabled.
     Given extended attribute OriginTrialEnabled=FeatureName, return:
         OriginTrials::{featureName}Enabled
 
     If the OriginTrialEnabled extended attribute is found, the includes are
     also updated as a side-effect.
     """
     extended_attributes = definition_or_member.extended_attributes
     is_origin_trial_enabled = 'OriginTrialEnabled' in extended_attributes
 
     if is_origin_trial_enabled and 'RuntimeEnabled' in extended_attributes:
         raise Exception('[OriginTrialEnabled] and [RuntimeEnabled] must '
                         'not be specified on the same definition: %s'
                         % definition_or_member.name)
 
-    if is_origin_trial_enabled and 'SecureContext' in extended_attributes:
-        raise Exception('[OriginTrialEnabled] and [SecureContext] must '
-                        'not be specified on the same definition '
-                        '(see https://crbug.com/695123 for workaround): %s'
-                        % definition_or_member.name)
-
     if is_origin_trial_enabled:
         trial_name = extended_attributes['OriginTrialEnabled']
         return 'OriginTrials::%sEnabled' % uncapitalize(trial_name)
 
     is_feature_policy_enabled = 'FeaturePolicy' in extended_attributes
 
     if is_feature_policy_enabled and 'RuntimeEnabled' in extended_attributes:
         raise Exception('[FeaturePolicy] and [RuntimeEnabled] must '
                         'not be specified on the same definition: %s'
                         % definition_or_member.name)
@@ skipping 39 matching lines @@
 def is_legacy_interface_type_checking(interface, member):
     return ('LegacyInterfaceTypeChecking' in interface.extended_attributes or
             'LegacyInterfaceTypeChecking' in member.extended_attributes)
 
 
 # [Unforgeable], [Global], [PrimaryGlobal]
 def on_instance(interface, member):
     """Returns True if the interface's member needs to be defined on every
     instance object.
 
-    The following members must be defiend on an instance object.
+    The following members must be defined on an instance object.
     - [Unforgeable] members
     - regular members of [Global] or [PrimaryGlobal] interfaces
     """
     if member.is_static:
         return False
 
     # TODO(yukishiino): Remove a hack for ToString once we support
     # Symbol.ToStringTag.
     if interface.name == 'Window' and member.name == 'ToString':
         return False
@@ skipping 173 matching lines @@
         return None
 
 
 IdlInterface.legacy_caller = property(legacy_caller)
 IdlInterface.indexed_property_getter = property(indexed_property_getter)
 IdlInterface.indexed_property_setter = property(indexed_property_setter)
 IdlInterface.indexed_property_deleter = property(indexed_property_deleter)
 IdlInterface.named_property_getter = property(named_property_getter)
 IdlInterface.named_property_setter = property(named_property_setter)
 IdlInterface.named_property_deleter = property(named_property_deleter)