checking in fix for topcrash bug 145147. r=bienvenu sr=mscott

modules/libpr0n/src/imgLoader.cpp

@@ -541,6 +541,12 @@ NS_IMETHODIMP imgLoader::SupportImageWithMimeType(const char* aMimeType, PRBool
 }
 
 NS_IMETHODIMP imgLoader::SupportImageWithContents(const char* aContents, PRUint32 aLength, char** aContentType)
+{
+  return GetMimeTypeFromContent(aContents, aLength, aContentType);
+}
+
+/* static */
+nsresult imgLoader::GetMimeTypeFromContent(const char* aContents, PRUint32 aLength, char** aContentType)
 {
   *aContentType = nsnull;
   /* Is it a GIF? */

modules/libpr0n/src/imgLoader.h

@@ -50,6 +50,8 @@ public:
   imgLoader();
   virtual ~imgLoader();
 
+  static nsresult GetMimeTypeFromContent(const char* aContents, PRUint32 aLength, char** aContentType);
+
 private:
   nsresult CreateNewProxyForRequest(imgRequest *aRequest, nsILoadGroup *aLoadGroup,
                                     imgIDecoderObserver *aObserver, nsISupports *cx,

modules/libpr0n/src/imgRequest.cpp

@@ -23,6 +23,7 @@
 
 #include "imgRequest.h"
 
+#include "imgLoader.h"
 #include "imgCache.h"
 #include "imgRequestProxy.h"
 
@@ -783,6 +784,5 @@ static NS_METHOD sniff_mimetype_callback(nsIInputStream* in,
 void
 imgRequest::SniffMimeType(const char *buf, PRUint32 len)
 {
-  nsCOMPtr<imgILoader> loader(do_GetService("@mozilla.org/image/loader;1"));
+  imgLoader::GetMimeTypeFromContent(buf, len, getter_Copies(mContentType));
-  loader->SupportImageWithContents(buf, len, getter_Copies(mContentType));
 }