diff --git a/mozilla/xpcom/proxy/public/nsProxyEvent.h b/mozilla/xpcom/proxy/public/nsProxyEvent.h index eb9b9b3288b..9e4da16623a 100644 --- a/mozilla/xpcom/proxy/public/nsProxyEvent.h +++ b/mozilla/xpcom/proxy/public/nsProxyEvent.h @@ -95,8 +95,6 @@ public: nsISupports* GetRealObject(); nsIEventQueue* GetQueue(); PRInt32 GetProxyType() const { return mProxyType; } - - PRLock* GetLock() const { return mLock; } private: @@ -106,9 +104,7 @@ private: nsCOMPtr mRealObject; /* the non-proxy object that this event is referring to. This is a strong ref. */ - PRLock *mLock; - nsresult convertMiniVariantToVariant(nsXPTMethodInfo * methodInfo, nsXPTCMiniVariant * params, nsXPTCVariant **fullParam, diff --git a/mozilla/xpcom/proxy/src/nsProxyEvent.cpp b/mozilla/xpcom/proxy/src/nsProxyEvent.cpp index c871cf67bbf..9669b268da1 100644 --- a/mozilla/xpcom/proxy/src/nsProxyEvent.cpp +++ b/mozilla/xpcom/proxy/src/nsProxyEvent.cpp @@ -215,7 +215,6 @@ nsProxyObject::nsProxyObject(nsIEventQueue *destQueue, PRInt32 proxyType, nsISup mRealObject = realObject; mDestQueue = do_QueryInterface(destQueue); mProxyType = proxyType; - mLock = PR_NewLock(); } @@ -230,7 +229,6 @@ nsProxyObject::nsProxyObject(nsIEventQueue *destQueue, PRInt32 proxyType, const mDestQueue = do_QueryInterface(destQueue); mProxyType = proxyType; - mLock = PR_NewLock(); } nsProxyObject::~nsProxyObject() @@ -240,7 +238,6 @@ nsProxyObject::~nsProxyObject() mRealObject = 0; mDestQueue = 0; - PR_DestroyLock(mLock); } // GetRealObject