| Index: third_party/WebKit/Source/bindings/tests/idls/core/TestObject.idl
|
| diff --git a/third_party/WebKit/Source/bindings/tests/idls/core/TestObject.idl b/third_party/WebKit/Source/bindings/tests/idls/core/TestObject.idl
|
| index 2ef48b33a756252d5e4fe84dd233cfbce55e4bcc..9d4315c78fba1feb995d9481234c3d95a6fb95b6 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/idls/core/TestObject.idl
|
| +++ b/third_party/WebKit/Source/bindings/tests/idls/core/TestObject.idl
|
| @@ -67,11 +67,11 @@ interface TestObject {
|
| [RuntimeEnabled=FeatureName2] const short FEATURE2_ENABLED_CONST1 = 3;
|
| [RuntimeEnabled=FeatureName2] const short FEATURE2_ENABLED_CONST2 = 4;
|
| [RuntimeEnabled=FeatureName3] const short FEATURE3_ENABLED_CONST1 = 5;
|
| - [RuntimeEnabled=FeatureName1, OriginTrialEnabled=FeatureName1] const short FEATURE1_RUNTIME_AND_EXPERIMENT_ENABLED_CONST1 = 1;
|
| - [RuntimeEnabled=FeatureName1, OriginTrialEnabled=FeatureName1] const short FEATURE1_RUNTIME_AND_EXPERIMENT_ENABLED_CONST2 = 2;
|
| - [RuntimeEnabled=FeatureName2, OriginTrialEnabled=FeatureName2] const short FEATURE2_RUNTIME_AND_EXPERIMENT_ENABLED_CONST1 = 3;
|
| - [RuntimeEnabled=FeatureName2, OriginTrialEnabled=FeatureName2] const short FEATURE2_RUNTIME_AND_EXPERIMENT_ENABLED_CONST2 = 4;
|
| - [RuntimeEnabled=FeatureName3, OriginTrialEnabled=FeatureName3] const short FEATURE3_RUNTIME_AND_EXPERIMENT_ENABLED_CONST1 = 5;
|
| + [RuntimeEnabled=FeatureName1, OriginTrialEnabled=FeatureName1] const short FEATURE1_ORIGIN_TRIAL_ENABLED_CONST1 = 1;
|
| + [RuntimeEnabled=FeatureName1, OriginTrialEnabled=FeatureName1] const short FEATURE1_ORIGIN_TRIAL_ENABLED_CONST2 = 2;
|
| + [RuntimeEnabled=FeatureName2, OriginTrialEnabled=FeatureName2] const short FEATURE2_ORIGIN_TRIAL_ENABLED_CONST1 = 3;
|
| + [RuntimeEnabled=FeatureName2, OriginTrialEnabled=FeatureName2] const short FEATURE2_ORIGIN_TRIAL_ENABLED_CONST2 = 4;
|
| + [RuntimeEnabled=FeatureName3, OriginTrialEnabled=FeatureName3] const short FEATURE3_ORIGIN_TRIAL_ENABLED_CONST1 = 5;
|
| [Reflect=CONST_IMPL] const short CONST_JAVASCRIPT = 1;
|
|
|
| stringifier attribute DOMString stringifierAttribute;
|
| @@ -194,13 +194,13 @@ interface TestObject {
|
| [CustomElementCallbacks] readonly attribute long customElementsCallbacksReadonlyLongAttribute;
|
| [DeprecateAs=LongAttribute] attribute long deprecatedLongAttribute;
|
| [EnforceRange] attribute long enforceRangeLongAttribute;
|
| - [OriginTrialEnabled=FeatureName, RuntimeEnabled=FeatureName] attribute long experimentRuntimeEnabledLongAttribute;
|
| [ImplementedAs=implementedAsName] attribute long implementedAsLongAttribute;
|
| [Custom, ImplementedAs=implementedAsNameWithCustom] attribute long customImplementedAsLongAttribute;
|
| [Custom=Getter, ImplementedAs=implementedAsNameWithCustomGetter] attribute long customGetterImplementedAsLongAttribute;
|
| [Custom=Setter, ImplementedAs=implementedAsNameWithCustomGetter] attribute long customSetterImplementedAsLongAttribute;
|
| [MeasureAs=TestFeature] attribute long measureAsLongAttribute;
|
| [NotEnumerable] attribute long notEnumerableLongAttribute;
|
| + [OriginTrialEnabled=FeatureName, RuntimeEnabled=FeatureName] attribute long originTrialEnabledLongAttribute;
|
| [PerWorldBindings] readonly attribute TestInterfaceEmpty perWorldBindingsReadonlyTestInterfaceEmptyAttribute;
|
| [LogActivity, LogAllWorlds, PerWorldBindings] attribute long activityLoggingAccessPerWorldBindingsLongAttribute;
|
| [LogActivity, PerWorldBindings] attribute long activityLoggingAccessForIsolatedWorldsPerWorldBindingsLongAttribute;
|
| @@ -258,7 +258,7 @@ interface TestObject {
|
| [Measure] attribute long measuredLongAttribute;
|
| [SameObject] attribute TestInterface sameObjectAttribute;
|
| [Unscopeable] attribute long unscopeableLongAttribute;
|
| - [Unscopeable, OriginTrialEnabled=FeatureName, RuntimeEnabled=FeatureName] attribute long unscopeableExperimentEnabledLongAttribute;
|
| + [Unscopeable, OriginTrialEnabled=FeatureName, RuntimeEnabled=FeatureName] attribute long unscopeableOriginTrialEnabledLongAttribute;
|
| [Unscopeable, RuntimeEnabled=FeatureName] attribute long unscopeableRuntimeEnabledLongAttribute;
|
| [Unscopeable] void unscopeableVoidMethod();
|
| [Unscopeable, RuntimeEnabled=FeatureName] void unscopeableRuntimeEnabledVoidMethod();
|
| @@ -519,14 +519,6 @@ interface TestObject {
|
| [CustomElementCallbacks] void customElementCallbacksVoidMethod();
|
| [DeprecateAs=voidMethod] void deprecatedVoidMethod();
|
| [DoNotCheckSignature] void doNotCheckSignatureVoidMethod();
|
| - [OriginTrialEnabled=FeatureName, RuntimeEnabled=FeatureName1] void experimentEnabledVoidMethod();
|
| - [PerWorldBindings, OriginTrialEnabled=FeatureName, RuntimeEnabled=FeatureName1] void perWorldBindingsExperimentEnabledVoidMethod();
|
| - [OriginTrialEnabled=FeatureName, RuntimeEnabled=FeatureName1] void experimentEnabledOverloadedVoidMethod(DOMString stringArg);
|
| - [OriginTrialEnabled=FeatureName, RuntimeEnabled=FeatureName1] void experimentEnabledOverloadedVoidMethod(long longArg);
|
| - [OriginTrialEnabled=FeatureName1, RuntimeEnabled=FeatureName1] void partiallyExperimentEnabledOverloadedVoidMethod(DOMString stringArg);
|
| - [OriginTrialEnabled=FeatureName2, RuntimeEnabled=FeatureName1] void partiallyExperimentEnabledOverloadedVoidMethod(TestInterface testInterfaceArg);
|
| - void partiallyExperimentEnabledOverloadedVoidMethod(long longArg, DOMString stringArg);
|
| - [OriginTrialEnabled=FeatureName3] void partiallyExperimentEnabledOverloadedVoidMethod(long longArg, DOMString stringArg, TestInterface testInterfaceArg);
|
| [ImplementedAs=implementedAsMethodName] void implementedAsVoidMethod();
|
| [MeasureAs=TestFeature] void measureAsVoidMethod();
|
| [Measure] void measureMethod();
|
| @@ -547,6 +539,14 @@ interface TestObject {
|
| [DeprecateAs=TestFeatureA, MeasureAs=TestFeatureB] void deprecateAsSameValueMeasureAsSameValueOverloadedMethod();
|
| [DeprecateAs=TestFeatureA, MeasureAs=TestFeatureB] void deprecateAsSameValueMeasureAsSameValueOverloadedMethod(long arg);
|
| [NotEnumerable] void notEnumerableVoidMethod();
|
| + [OriginTrialEnabled=FeatureName, RuntimeEnabled=FeatureName1] void originTrialEnabledVoidMethod();
|
| + [PerWorldBindings, OriginTrialEnabled=FeatureName, RuntimeEnabled=FeatureName1] void perWorldBindingsOriginTrialEnabledVoidMethod();
|
| + [OriginTrialEnabled=FeatureName, RuntimeEnabled=FeatureName1] void originTrialEnabledOverloadedVoidMethod(DOMString stringArg);
|
| + [OriginTrialEnabled=FeatureName, RuntimeEnabled=FeatureName1] void originTrialEnabledOverloadedVoidMethod(long longArg);
|
| + [OriginTrialEnabled=FeatureName1, RuntimeEnabled=FeatureName1] void partiallyOriginTrialEnabledOverloadedVoidMethod(DOMString stringArg);
|
| + [OriginTrialEnabled=FeatureName2, RuntimeEnabled=FeatureName1] void partiallyOriginTrialEnabledOverloadedVoidMethod(TestInterface testInterfaceArg);
|
| + void partiallyOriginTrialEnabledOverloadedVoidMethod(long longArg, DOMString stringArg);
|
| + [OriginTrialEnabled=FeatureName3] void partiallyOriginTrialEnabledOverloadedVoidMethod(long longArg, DOMString stringArg, TestInterface testInterfaceArg);
|
| [PerWorldBindings] void perWorldBindingsVoidMethod();
|
| [PerWorldBindings] void perWorldBindingsVoidMethodTestInterfaceEmptyArg(TestInterfaceEmpty testInterfaceEmptyArg);
|
| [PostMessage, RaisesException] void postMessage(SerializedScriptValue message, optional sequence<Transferable> transfer);
|
|
|