| Index: Source/bindings/tests/idls/TestObject.idl
|
| diff --git a/Source/bindings/tests/idls/TestObject.idl b/Source/bindings/tests/idls/TestObject.idl
|
| index 28710f4d904ebdcfd9858e6f2c64e977ce1375e2..a7d6d4d1ae5c2ec2e42a3ef1dd3a57e1b3b2ea4d 100644
|
| --- a/Source/bindings/tests/idls/TestObject.idl
|
| +++ b/Source/bindings/tests/idls/TestObject.idl
|
| @@ -35,7 +35,7 @@ enum TestEnumType { "", "EnumValue1", "EnumValue2", "EnumValue3" };
|
| callback TestCallbackFunction = void (TestEnumType formal1, TestObject formal2);
|
|
|
| [
|
| - Constructor(TestCallback testCallback),
|
| + Constructor(TestCallbackInterface testCallbackInterface),
|
| ImplementedAs=TestObj
|
| ] interface TestObject : EventTarget {
|
| // Attributes
|
| @@ -147,14 +147,14 @@ callback TestCallbackFunction = void (TestEnumType formal1, TestObject formal2);
|
| void methodWithOptionalStringIsUndefined([Default=Undefined] optional DOMString str);
|
| void methodWithOptionalStringIsNullString([Default=NullString] optional DOMString str);
|
|
|
| - // Callback parameters
|
| - void methodWithCallbackArg(TestCallback callback);
|
| - void methodWithNonCallbackArgAndCallbackArg(long nonCallback, TestCallback callback);
|
| - void methodWithCallbackAndOptionalArg(optional TestCallback callback);
|
| - void methodWithNullableCallbackArg(TestCallback? callback);
|
| - // static methods with Callback parameter
|
| - static void staticMethodWithCallbackAndOptionalArg(optional TestCallback callback);
|
| - static void staticMethodWithCallbackArg(TestCallback callback);
|
| + // Callback interface parameters
|
| + void methodWithCallbackInterfaceArg(TestCallbackInterface callbackInterface);
|
| + void methodWithNonCallbackArgAndCallbackInterfaceArg(long nonCallback, TestCallbackInterface callbackInterface);
|
| + void methodWithCallbackInterfaceAndOptionalArg(optional TestCallbackInterface callbackInterface);
|
| + void methodWithNullableCallbackInterfaceArg(TestCallbackInterface? callbackInterface);
|
| + // static methods with callback interface parameter
|
| + static void staticMethodWithCallbackAndOptionalArg(optional TestCallbackInterface callbackInterface);
|
| + static void staticMethodWithCallbackArg(TestCallbackInterface callbackInterface);
|
|
|
| // 'EnforceRange' extended attribute
|
| void methodWithEnforceRangeInt8([EnforceRange] byte value);
|
| @@ -202,7 +202,7 @@ callback TestCallbackFunction = void (TestEnumType formal1, TestObject formal2);
|
|
|
| // Overloads
|
| void overloadedMethod(long longArg);
|
| - void overloadedMethod(TestCallback callbackArg);
|
| + void overloadedMethod(TestCallbackInterface callbackInterfaceArg);
|
| void overloadedMethod(TestObject objArg);
|
| void overloadedMethod(DOMString[] arrayArg);
|
| void overloadedMethod(sequence<unsigned long> sequenceArg);
|
|
|