Merge extensions/python/xpcom changes from DOM_AGNOSTIC2_BRANCH into the

trunk.


git-svn-id: svn://10.0.0.236/trunk@187878 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/extensions/python/xpcom/test/test_component/py_test_component.idl

@@ -212,6 +212,7 @@ interface nsIPythonTestInterfaceExtra : nsIPythonTestInterface
     void AppendArray(inout PRUint32 count, [array, size_is(count)]in PRInt32 array1, [array, size_is(count)]inout PRInt32 array2);
     void AppendVariant(in nsIVariant variant, inout nsIVariant result);
     nsIVariant CopyVariant(in nsIVariant variant);
+    nsIVariant SumVariants(in PRUint32 incount, [array, size_is(incount)]in nsIVariant variants);
 };
 
 // DOM String support is a "recent" (01/2001) addition to XPCOM.  These test 

mozilla/extensions/python/xpcom/test/test_component/py_test_component.py

@@ -365,6 +365,14 @@ class PythonTestComponent:
     def CopyVariant(self, invar):
         return invar
 
+    def SumVariants(self, variants):
+        if len(variants) == 0:
+            return None
+        result = variants[0]
+        for v in variants[1:]:
+            result += v
+        return result
+
     # Some tests for the "new" (Feb-2001) DOMString type.
     def GetDOMStringResult( self, length ):
         # Result: DOMString &