added a context param to the stream converter service

netwerk/streamconv/public/nsIStreamConverterService.idl

@@ -26,10 +26,12 @@ interface nsIStreamConverterService : nsISupports {
 
     nsIInputStream Convert(in nsIInputStream aFromStream,
 						   in wstring aFromType,
-						   in wstring aToType);
+						   in wstring aToType,
+                           in nsISupports aContext);
 
     nsIStreamListener AsyncConvertData(in wstring aFromType, 
                                        in wstring aToType, 
-                                       in nsIStreamListener aListener);
+                                       in nsIStreamListener aListener,
+                                       in nsISupports aContext);
 
 };

netwerk/streamconv/src/nsStreamConverterService.cpp

@@ -466,6 +466,7 @@ NS_IMETHODIMP
 nsStreamConverterService::Convert(nsIInputStream *aFromStream,
                                   const PRUnichar *aFromType, 
                                   const PRUnichar *aToType,
+                                  nsISupports *aContext,
                                   nsIInputStream **_retval) {
     if (!aFromStream || !aFromType || !aToType || !_retval) return NS_ERROR_NULL_POINTER;
     nsresult rv;
@@ -546,7 +547,7 @@ nsStreamConverterService::Convert(nsIInputStream *aFromStream,
 
             PRUnichar *fromUni = fromStr.ToNewUnicode();
             PRUnichar *toUni   = toStr.ToNewUnicode();
-            rv = conv->Convert(dataToConvert, fromUni, toUni, nsnull, &convertedData);
+            rv = conv->Convert(dataToConvert, fromUni, toUni, aContext, &convertedData);
             nsAllocator::Free(fromUni);
             nsAllocator::Free(toUni);
             NS_RELEASE(conv);
@@ -570,7 +571,7 @@ nsStreamConverterService::Convert(nsIInputStream *aFromStream,
         rv = converter->QueryInterface(nsCOMTypeInfo<nsIStreamConverter>::GetIID(), (void**)&conv);
         NS_RELEASE(converter);
         if (NS_FAILED(rv)) return rv;
-        rv = conv->Convert(aFromStream, aFromType, aToType, nsnull, _retval);
+        rv = conv->Convert(aFromStream, aFromType, aToType, aContext, _retval);
         NS_RELEASE(conv);
     }
     
@@ -582,6 +583,7 @@ NS_IMETHODIMP
 nsStreamConverterService::AsyncConvertData(const PRUnichar *aFromType, 
                                            const PRUnichar *aToType, 
                                            nsIStreamListener *aListener,
+                                           nsISupports *aContext,
                                            nsIStreamListener **_retval) {
     if (!aFromType || !aToType || !aListener || !_retval) return NS_ERROR_NULL_POINTER;
 
@@ -642,7 +644,7 @@ nsStreamConverterService::AsyncConvertData(const PRUnichar *aFromType,
             PRUnichar *fromStrUni = fromStr.ToNewUnicode();
             PRUnichar *toStrUni   = toStr.ToNewUnicode();
 
-            rv = conv->AsyncConvertData(fromStrUni, toStrUni, forwardListener, nsnull);
+            rv = conv->AsyncConvertData(fromStrUni, toStrUni, forwardListener, aContext);
             nsAllocator::Free(fromStrUni);
             nsAllocator::Free(toStrUni);
             if (NS_FAILED(rv)) return rv;
@@ -676,8 +678,7 @@ nsStreamConverterService::AsyncConvertData(const PRUnichar *aFromType,
         NS_RELEASE(converter);
         if (NS_FAILED(rv)) return rv;
 
-        // XXX we should pass some context through
+        rv = conv->AsyncConvertData(aFromType, aToType, aListener, aContext);
-        rv = conv->AsyncConvertData(aFromType, aToType, aListener, nsnull);
         NS_RELEASE(conv);
     }
     

netwerk/streamconv/test/TestStreamConv.cpp

@@ -26,6 +26,8 @@
 #include "nsIIOService.h"
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 
+#include "nspr.h"
+
 
 #define ASYNC_TEST // undefine this if you want to test sycnronous conversion.
 
@@ -289,7 +291,7 @@ main(int argc, char* argv[])
     // unconverted data of fromType, and the final listener in the chain (in this case
     // the dataReceiver.
     nsIStreamListener *converterListener = nsnull;
-    rv = StreamConvService->AsyncConvertData(from, to, dataReceiver, &converterListener);
+    rv = StreamConvService->AsyncConvertData(from, to, dataReceiver, nsnull, &converterListener);
     if (NS_FAILED(rv)) return rv;
 
     // at this point we have a stream listener to push data to, and the one
@@ -328,7 +330,7 @@ main(int argc, char* argv[])
 
 #else
     // SYNCRONOUS conversion
-    rv = StreamConvService->Convert(inputData, from, to, &convertedData);
+    rv = StreamConvService->Convert(inputData, from, to, nsnull, &convertedData);
 #endif
 
     NS_RELEASE(convFactSup);

uriloader/base/nsDocLoader.cpp

@@ -2413,6 +2413,7 @@ nsChannelListener::OnStartRequest(nsIChannel *aChannel, nsISupports *aContext)
     nsIStreamListener *converterListener = nsnull;
     rv = StreamConvService->AsyncConvertData(from.GetUnicode(), 
                                              to.GetUnicode(), mNextListener,
+                                             nsnull, /* some nsISupports context */
                                              &converterListener);
     mNextListener = converterListener;
   }

webshell/src/nsDocLoader.cpp

@@ -2413,6 +2413,7 @@ nsChannelListener::OnStartRequest(nsIChannel *aChannel, nsISupports *aContext)
     nsIStreamListener *converterListener = nsnull;
     rv = StreamConvService->AsyncConvertData(from.GetUnicode(), 
                                              to.GetUnicode(), mNextListener,
+                                             nsnull, /* some nsISupports context */
                                              &converterListener);
     mNextListener = converterListener;
   }