Bug 869928 - Remove Off-Main-Thread XPCWrappedJS refcounting from OpenSignedJARFileTask. r=bsmith

This commit is contained in:
Josh Matthews 2013-05-09 15:43:25 -04:00
parent 7c9123ad64
commit 7872e602cb

View File

@ -20,6 +20,7 @@
#include "nsIStringEnumerator.h" #include "nsIStringEnumerator.h"
#include "nsIZipReader.h" #include "nsIZipReader.h"
#include "nsNSSCertificate.h" #include "nsNSSCertificate.h"
#include "nsProxyRelease.h"
#include "nsString.h" #include "nsString.h"
#include "nsTHashtable.h" #include "nsTHashtable.h"
#include "ScopedNSSTypes.h" #include "ScopedNSSTypes.h"
@ -727,7 +728,7 @@ public:
OpenSignedJARFileTask(nsIFile * aJarFile, OpenSignedJARFileTask(nsIFile * aJarFile,
nsIOpenSignedJARFileCallback * aCallback) nsIOpenSignedJARFileCallback * aCallback)
: mJarFile(aJarFile) : mJarFile(aJarFile)
, mCallback(aCallback) , mCallback(new nsMainThreadPtrHolder<nsIOpenSignedJARFileCallback>(aCallback))
{ {
} }
@ -748,7 +749,7 @@ private:
} }
const nsCOMPtr<nsIFile> mJarFile; const nsCOMPtr<nsIFile> mJarFile;
const nsCOMPtr<nsIOpenSignedJARFileCallback> mCallback; nsMainThreadPtrHandle<nsIOpenSignedJARFileCallback> mCallback;
nsCOMPtr<nsIZipReader> mZipReader; // out nsCOMPtr<nsIZipReader> mZipReader; // out
nsCOMPtr<nsIX509Cert3> mSignerCert; // out nsCOMPtr<nsIX509Cert3> mSignerCert; // out
}; };