Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 675702: Call nsICertVerificationListener on the main thread, rev. 1, r=bsmith, r=mayhemer

Browse Source
This commit is contained in:
Benjamin Smedberg 2011-11-02 21:06:51 -07:00
parent a42b4e1ae9
commit dee00f8b91
3 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
security/manager/pki/resources/content/viewCertDetails.js
View File

@ -134,9 +134,7 @@ function setWindowName()
if (cert instanceof nsIX509Cert3)
{
cert.requestUsagesArrayAsync(
getProxyOnUIThread(new listener(),
Components.interfaces.nsICertVerificationListener));
cert.requestUsagesArrayAsync(new listener());
}
}
@ -316,20 +314,6 @@ function updateCertDump()
displaySelected();
}
function getProxyOnUIThread(aObject, aInterface) {
var mainThread = Components.
classes["@mozilla.org/thread-manager;1"].
getService().mainThread;
var proxyMgr = Components.
classes["@mozilla.org/xpcomproxy;1"].
getService(Components.interfaces.nsIProxyObjectManager);
return proxyMgr.getProxyForObject(mainThread,
aInterface, aObject, 5);
// 5 == NS_PROXY_ALWAYS | NS_PROXY_SYNC
}
function getCurrentCert()
{
var realIndex;

2
security/manager/ssl/public/nsIX509Cert3.idl
View File

@ -57,7 +57,7 @@ interface nsIX509Cert3 : nsIX509Cert2 {
* Async version of nsIX509Cert::getUsagesArray()
*
* Will not block, will request results asynchronously,
* availability of results will be notified.
* availability of results will be notified on the main thread.
*/
void requestUsagesArrayAsync(in nsICertVerificationListener cvl);

28
security/manager/ssl/src/nsCertVerificationThread.cpp
View File

@ -38,6 +38,7 @@
#include "nsMemory.h"
#include "nsAutoPtr.h"
#include "nsCertVerificationThread.h"
#include "nsThreadUtils.h"
using namespace mozilla;
@ -45,6 +46,30 @@ nsCertVerificationThread *nsCertVerificationThread::verification_thread_singleto
NS_IMPL_THREADSAFE_ISUPPORTS1(nsCertVerificationResult, nsICertVerificationResult)
namespace {
class DispatchCertVerificationResult : public nsRunnable
{
public:
DispatchCertVerificationResult(nsICertVerificationListener* aListener,
nsIX509Cert3* aCert,
nsICertVerificationResult* aResult)
: mListener(aListener)
, mCert(aCert)
, mResult(aResult)
{ }
NS_IMETHOD Run() {
mListener->Notify(mCert, mResult);
return NS_OK;
}
private:
nsCOMPtr<nsICertVerificationListener> mListener;
nsCOMPtr<nsIX509Cert3> mCert;
nsCOMPtr<nsICertVerificationResult> mResult;
};
} // anonymous namespace
void nsCertVerificationJob::Run()
{
if (!mListener || !mCert)
@ -74,7 +99,8 @@ void nsCertVerificationJob::Run()
}
nsCOMPtr<nsIX509Cert3> c3 = do_QueryInterface(mCert);
mListener->Notify(c3, ires);
nsCOMPtr<nsIRunnable> r = new DispatchCertVerificationResult(mListener, c3, ires);
NS_DispatchToMainThread(r);
}
void nsSMimeVerificationJob::Run()