Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 887191 - Force wrapped JS listeners to proxy callbacks to the main thread if no target is specified. r=mcmanus

Browse Source
This commit is contained in:
Josh Matthews 2013-06-26 15:54:05 +01:00
parent 577cd0be78
commit 635646f106
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
netwerk/dns/nsDNSService2.cpp
View File

@ -10,6 +10,7 @@
#include "nsIPrefService.h"
#include "nsIPrefBranch.h"
#include "nsIServiceManager.h"
#include "nsIXPConnect.h"
#include "nsProxyRelease.h"
#include "nsReadableUtils.h"
#include "nsString.h"
@ -255,11 +256,7 @@ public:
uint16_t af)
: mResolver(res)
, mHost(host)
// Sometimes aListener is a main-thread only object like XPCWrappedJS, and
// sometimes it's a threadsafe object like nsSocketTransport. Use a main-
// thread pointer holder, but disable strict enforcement of thread invariants.
// The AddRef implementation of XPCWrappedJS will assert if we go wrong here.
, mListener(new nsMainThreadPtrHolder<nsIDNSListener>(listener, false))
, mListener(listener)
, mFlags(flags)
, mAF(af) {}
~nsDNSAsyncRequest() {}
@ -272,7 +269,7 @@ public:
nsRefPtr<nsHostResolver> mResolver;
nsCString mHost; // hostname we're resolving
nsMainThreadPtrHandle<nsIDNSListener> mListener;
nsCOMPtr<nsIDNSListener> mListener;
uint16_t mFlags;
uint16_t mAF;
};
@ -296,7 +293,7 @@ nsDNSAsyncRequest::OnLookupComplete(nsHostResolver *resolver,
MOZ_EVENT_TRACER_DONE(this, "net::dns::lookup");
mListener->OnLookupComplete(this, rec, status);
mListener = nsMainThreadPtrHandle<nsIDNSListener>();
mListener = nullptr;
// release the reference to ourselves that was added before we were
// handed off to the host resolver.
@ -590,13 +587,14 @@ NS_IMETHODIMP
nsDNSService::AsyncResolve(const nsACString &hostname,
uint32_t flags,
nsIDNSListener *listener,
nsIEventTarget *target,
nsIEventTarget *target_,
nsICancelable **result)
{
// grab reference to global host resolver and IDN service. beware
// simultaneous shutdown!!
nsRefPtr<nsHostResolver> res;
nsCOMPtr<nsIIDNService> idn;
nsCOMPtr<nsIEventTarget> target = target_;
bool localDomain = false;
{
MutexAutoLock lock(mLock);
@ -627,6 +625,13 @@ nsDNSService::AsyncResolve(const nsACString &hostname,
hostPtr = &hostACE;
}
nsCOMPtr<nsIXPConnectWrappedJS> wrappedListener = do_QueryInterface(listener);
if (wrappedListener && !target) {
nsCOMPtr<nsIThread> mainThread;
NS_GetMainThread(getter_AddRefs(mainThread));
target = do_QueryInterface(mainThread);
}
if (target) {
listener = new DNSListenerProxy(listener, target);
}