V8 bindings gen: Error if OriginTrialEnabled and SecureContext together.

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 368 matching lines @@
         if interface is not None:
             measure_as_name = '%s_%s' % (capitalize(interface.name), measure_as_name)
         return lambda suffix: 'V8%s_%s' % (measure_as_name, suffix)
     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 both the OriginTrialEnabled and RuntimeEnabled
-    extended attributes are applied to the same IDL member. Only one of the
-    two attributes can be applied to any member - they are mutually exclusive.
+    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.%s' % (definition_or_member.idl_name, definition_or_member.name))
+                        'not be specified on the same definition: %s'
+                        % definition_or_member.name)

[Matt Giuca, 2017/03/29 05:09:33]

This was crashing on idl_name... idl_name was removed in r427281 and I can't
find any way to access the name of the outer object. Oh well.

+
+    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

[Matt Giuca, 2017/03/29 05:09:33]

This looks like exactly the same logic as OriginTrialEnabled... does the same
restriction apply?

If so maybe we should factor this out to avoid duplicating both paths. (I can do
that in this CL.)

[Yuki, 2017/03/29 06:38:06]

Looks like [FeaturePolicy] is deprecated and actually not used.  I think we can
simply remove all related code about [FeaturePolicy].

[haraken, 2017/03/29 06:43:11]

This looks interesting.

+iclelland What's your plan about the [FeaturePolicy] IDL extended attribute?

 
     if is_feature_policy_enabled and 'RuntimeEnabled' in extended_attributes:
         raise Exception('[FeaturePolicy] and [RuntimeEnabled] must '
-                        'not be specified on the same definition: '
-                        '%s.%s' % (definition_or_member.idl_name, definition_or_member.name))
+                        'not be specified on the same definition: %s'
+                        % definition_or_member.name)
 
     if is_feature_policy_enabled:
         includes.add('bindings/core/v8/ScriptState.h')
         includes.add('platform/feature_policy/FeaturePolicy.h')
 
         trial_name = extended_attributes['FeaturePolicy']
         return 'FeaturePolicy::%sEnabled' % uncapitalize(trial_name)
 
     return None
 
@@ skipping 217 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)