IDL compiler: sync Python to r163665

Source/bindings/tests/idls/TestObject.idl

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary formstrArg, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 17 matching lines @@
  */
 
 // This IDL file is for testing the bindings code generator and for tracking
 // changes in its ouput.
 
 enum TestEnumType { "", "EnumValue1", "EnumValue2", "EnumValue3" };
 
 callback TestCallbackFunction = void (TestEnumType formal1, TestObject formal2);
 
 [
-    Constructor(TestCallback testCallback),
+    Constructor(TestCallbackInterface testCallbackInterface),
     ImplementedAs=TestObj
 ] interface TestObject : EventTarget {
     // Attributes
     readonly attribute long            readOnlyLongAttr;
     readonly attribute DOMString       readOnlyStringAttr;
     readonly attribute TestObject         readOnlyTestObjectAttr;
     static readonly attribute long     staticReadOnlyLongAttr;
     static attribute DOMString         staticStringAttr;
     static readonly attribute TestSubObjConstructor TestSubObj;
     attribute TestEnumType             enumAttr;
@@ skipping 91 matching lines @@
     [CallWith=  ExecutionContext  &  ScriptState  ] attribute TestObject withExecutionContextAndScriptStateWithSpacesAttribute;
 
     // optional parameters
     void    methodWithOptionalArg(optional long opt);
     void    methodWithNonOptionalArgAndOptionalArg(long nonOpt, optional long opt);
     void    methodWithNonOptionalArgAndTwoOptionalArgs(long nonOpt, optional long opt1, optional long opt2);
     void    methodWithOptionalString(optional DOMString str);
     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);
     void    methodWithEnforceRangeUInt8([EnforceRange] octet value);
     void    methodWithEnforceRangeInt16([EnforceRange] short value);
     void    methodWithEnforceRangeUInt16([EnforceRange] unsigned short value);
     void    methodWithEnforceRangeInt32([EnforceRange] long value);
     void    methodWithEnforceRangeUInt32([EnforceRange] unsigned long value);
     void    methodWithEnforceRangeInt64([EnforceRange] long long value);
     void    methodWithEnforceRangeUInt64([EnforceRange] unsigned long long value);
@@ skipping 27 matching lines @@
     [RaisesException=Getter, CachedAttribute=isValueDirty] readonly attribute any cachedDirtyableAttributeRaises;
 
     attribute any anyAttribute;
 
     attribute TestCallbackFunction callbackFunctionAttribute;
     TestCallbackFunction callbackFunctionReturnValue();
     void callbackFunctionArgument(TestCallbackFunction function);
 
     // 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);
     void    overloadedMethodA(TestObject? objArg, optional long longArg);
     void    overloadedMethodA(TestObject? objArg, DOMString strArg);
     void    overloadedMethodB(DOMString strArg);
     void    overloadedMethodB([StrictTypeChecking] DOMString strArg);
 
     // Class methods within JavaScript (like what's used for IDBKeyRange).
     static void classMethod();
@@ skipping 87 matching lines @@
     [DeprecateAs=Constant] const unsigned short DEPRECATED_CONSTANT = 1;
 
     // PutForwards
     [PutForwards=href] readonly attribute TestNode location;
     [PutForwards=hrefThrows] readonly attribute TestNode locationWithException;
 };
 
 // The following comment should not generate any code
 // TestObject implements TestImplements;