Make [OriginTrialEnabled] and [RuntimeEnabled] mutually exclusive

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 348 matching lines @@
         return lambda suffix: extended_attributes['MeasureAs']
     if 'Measure' in extended_attributes:
         includes.add('core/frame/UseCounter.h')
         measure_as_name = capitalize(definition_or_member.name)
         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, interface):
+    """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.
+
+    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))
+
+    if is_origin_trial_enabled:
+        includes.add('core/inspector/ConsoleMessage.h')
+        includes.add('core/origin_trials/OriginTrials.h')
+
+        trial_name = extended_attributes['OriginTrialEnabled']
+        return 'OriginTrials::%sEnabled' % uncapitalize(trial_name)
+
+    return None
+
+
 def runtime_feature_name(definition_or_member):
     extended_attributes = definition_or_member.extended_attributes
     if 'RuntimeEnabled' not in extended_attributes:
         return None
     return extended_attributes['RuntimeEnabled']
 
 
-def is_origin_trial_enabled(definition_or_member):
-    return 'OriginTrialEnabled' in definition_or_member.extended_attributes
-
-
-def origin_trial_name(definition_or_member):
-    return definition_or_member.extended_attributes['OriginTrialEnabled'] if is_origin_trial_enabled(definition_or_member) else None
-
-
-def origin_trial_enabled_function(definition_or_member):
-    trial_name = origin_trial_name(definition_or_member)
-    feature_name = runtime_feature_name(definition_or_member)
-    if not feature_name or not trial_name:
-        return
-    return 'OriginTrials::%sEnabled' % uncapitalize(feature_name)
-
-
 # [RuntimeEnabled]
 def runtime_enabled_function_name(definition_or_member):
     """Returns the name of the RuntimeEnabledFeatures function.
 
     The returned function checks if a method/attribute is enabled.
     Given extended attribute RuntimeEnabled=FeatureName, return:
         RuntimeEnabledFeatures::{featureName}Enabled
+
+    If the RuntimeEnabled extended attribute is found, the includes
+    are also updated as a side-effect.
     """
     feature_name = runtime_feature_name(definition_or_member)
 
-    # If an origin trial is on the method/attribute, it overrides the runtime
-    # enabled status. For now, we are unconditionally installing these
-    # attributes/methods, so we are acting as though the runtime enabled
-    # function doesn't exist. (It is checked in the generated OriginTrials
-    # function, instead)
-    trial_name = origin_trial_name(definition_or_member)
-    if not feature_name or trial_name:
+    if not feature_name:
         return
+
+    includes.add('platform/RuntimeEnabledFeatures.h')
     return 'RuntimeEnabledFeatures::%sEnabled' % uncapitalize(feature_name)
 
 
 # [Unforgeable]
 def is_unforgeable(interface, member):
     return (('Unforgeable' in interface.extended_attributes or
              'Unforgeable' in member.extended_attributes) and
             not member.is_static)
 
 
@@ skipping 173 matching lines @@
     except StopIteration:
         return None
 
 
 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)