Bug 850246 - Remove Off-Main-Thread XPCWrappedJS refcounting from ServerSocketListenerProxy. r=mcmanus

This commit is contained in:
Bobby Holley 2013-03-18 20:39:54 -07:00
parent dd915d85dc
commit a3fa501952

View File

@ -345,7 +345,7 @@ class ServerSocketListenerProxy MOZ_FINAL : public nsIServerSocketListener
{
public:
ServerSocketListenerProxy(nsIServerSocketListener* aListener)
: mListener(aListener)
: mListener(new nsMainThreadPtrHolder<nsIServerSocketListener>(aListener))
, mTargetThread(do_GetCurrentThread())
{ }
@ -355,7 +355,7 @@ public:
class OnSocketAcceptedRunnable : public nsRunnable
{
public:
OnSocketAcceptedRunnable(nsIServerSocketListener* aListener,
OnSocketAcceptedRunnable(nsMainThreadPtrHolder<nsIServerSocketListener>* aListener,
nsIServerSocket* aServ,
nsISocketTransport* aTransport)
: mListener(aListener)
@ -366,7 +366,7 @@ public:
NS_DECL_NSIRUNNABLE
private:
nsCOMPtr<nsIServerSocketListener> mListener;
nsMainThreadPtrHandle<nsIServerSocketListener> mListener;
nsCOMPtr<nsIServerSocket> mServ;
nsCOMPtr<nsISocketTransport> mTransport;
};
@ -374,7 +374,7 @@ public:
class OnStopListeningRunnable : public nsRunnable
{
public:
OnStopListeningRunnable(nsIServerSocketListener* aListener,
OnStopListeningRunnable(nsMainThreadPtrHolder<nsIServerSocketListener>* aListener,
nsIServerSocket* aServ,
nsresult aStatus)
: mListener(aListener)
@ -385,13 +385,13 @@ public:
NS_DECL_NSIRUNNABLE
private:
nsCOMPtr<nsIServerSocketListener> mListener;
nsMainThreadPtrHandle<nsIServerSocketListener> mListener;
nsCOMPtr<nsIServerSocket> mServ;
nsresult mStatus;
};
private:
nsCOMPtr<nsIServerSocketListener> mListener;
nsMainThreadPtrHandle<nsIServerSocketListener> mListener;
nsCOMPtr<nsIEventTarget> mTargetThread;
};