Removing ProxyType so that I can do masking
Added new proxy type so that we bypass the Current Thread check. git-svn-id: svn://10.0.0.236/trunk@43487 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -137,7 +137,7 @@ nsProxyObjectManager::Create(nsISupports* outer, const nsIID& aIID, void* *aInst
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsProxyObjectManager::GetProxyObject(nsIEventQueue *destQueue, REFNSIID aIID, nsISupports* aObj, ProxyType proxyType, void** aProxyObject)
|
||||
nsProxyObjectManager::GetProxyObject(nsIEventQueue *destQueue, REFNSIID aIID, nsISupports* aObj, PRInt32 proxyType, void** aProxyObject)
|
||||
{
|
||||
nsIEventQueue *postQ = destQueue;
|
||||
|
||||
@@ -171,7 +171,7 @@ nsProxyObjectManager::GetProxyObject(nsIEventQueue *destQueue, REFNSIID aIID, ns
|
||||
|
||||
// check to see if the eventQ is on our thread. If so, just return the real object.
|
||||
|
||||
if (postQ != nsnull && proxyType != PROXY_ASYNC)
|
||||
if (postQ != nsnull && !(proxyType & PROXY_ASYNC) && !(proxyType & PROXY_ALWAYS))
|
||||
{
|
||||
PRBool aResult;
|
||||
postQ->IsQueueOnCurrentThread(&aResult);
|
||||
@@ -198,7 +198,7 @@ nsProxyObjectManager::GetProxyObject(nsIEventQueue *destQueue,
|
||||
const nsCID &aClass,
|
||||
nsISupports *aDelegate,
|
||||
const nsIID &aIID,
|
||||
ProxyType proxyType,
|
||||
PRInt32 proxyType,
|
||||
void** aProxyObject)
|
||||
{
|
||||
*aProxyObject = nsnull;
|
||||
|
||||
Reference in New Issue
Block a user