diff --git a/mozilla/xpcom/threads/nsEventQueue.cpp b/mozilla/xpcom/threads/nsEventQueue.cpp index cd9812da420..88182e281e9 100644 --- a/mozilla/xpcom/threads/nsEventQueue.cpp +++ b/mozilla/xpcom/threads/nsEventQueue.cpp @@ -219,10 +219,9 @@ NS_IMETHODIMP nsEventQueueImpl::ProcessPendingEvents() { PRBool correctThread = PL_IsQueueOnCurrentThread(mEventQueue); - /* until dougt fixes #22943, turning this off of the mac */ -#ifndef XP_MAC + NS_ASSERTION(correctThread, "attemping to process events on the wrong thread"); -#endif /* XP_MAC */ + if (!correctThread) return NS_ERROR_FAILURE; @@ -235,10 +234,9 @@ NS_IMETHODIMP nsEventQueueImpl::EventLoop() { PRBool correctThread = PL_IsQueueOnCurrentThread(mEventQueue); - /* until dougt fixes #22943, turning this off of the mac */ -#ifndef XP_MAC + NS_ASSERTION(correctThread, "attemping to process events on the wrong thread"); -#endif /* XP_MAC */ + if (!correctThread) return NS_ERROR_FAILURE; diff --git a/mozilla/xpcom/threads/nsEventQueueService.cpp b/mozilla/xpcom/threads/nsEventQueueService.cpp index 85e76c35557..424bc00fa54 100644 --- a/mozilla/xpcom/threads/nsEventQueueService.cpp +++ b/mozilla/xpcom/threads/nsEventQueueService.cpp @@ -536,33 +536,3 @@ nsEventQueueServiceImpl::ResolveEventQueue(nsIEventQueue* queueOrConstant, nsIEv NS_ADDREF(*resultQueue); return NS_OK; } - -#ifdef XP_MAC -// MAC specific. Will go away someday -// Bwah ha ha h ha ah aha ha ha -NS_IMETHODIMP nsEventQueueServiceImpl::ProcessEvents() -{ - if (mEventQTable) { - EventQueueEntry *entry; - nsIEventQueue *queue; - - // never use the hashtable enumerator if there's a chance (there is) that an - // event queue entry could be destroyed while inside. this enumerator can - // handle that. - PR_EnterMonitor(mEventQMonitor); - mEnumerator.Reset(mBaseEntry); - while ((entry = mEnumerator.Get()) != 0) { - PR_ExitMonitor(mEventQMonitor); - queue = entry->GetEventQueue(); - if (queue) { - queue->ProcessPendingEvents(); - NS_RELEASE(queue); - } - PR_EnterMonitor(mEventQMonitor); - } - PR_ExitMonitor(mEventQMonitor); - } - return NS_OK; -} - -#endif diff --git a/mozilla/xpcom/threads/nsEventQueueService.h b/mozilla/xpcom/threads/nsEventQueueService.h index ea0a40fddae..5fc1dceb1b7 100644 --- a/mozilla/xpcom/threads/nsEventQueueService.h +++ b/mozilla/xpcom/threads/nsEventQueueService.h @@ -69,10 +69,6 @@ public: NS_IMETHOD PopThreadEventQueue(nsIEventQueue *aQueue); -#ifdef XP_MAC - NS_IMETHOD ProcessEvents(); -#endif - private: NS_IMETHOD CreateEventQueue(PRThread *aThread); void AddEventQueueEntry(EventQueueEntry *aEntry); diff --git a/mozilla/xpcom/threads/nsIEventQueueService.h b/mozilla/xpcom/threads/nsIEventQueueService.h index c4a963571cd..cfd98551b09 100644 --- a/mozilla/xpcom/threads/nsIEventQueueService.h +++ b/mozilla/xpcom/threads/nsIEventQueueService.h @@ -71,10 +71,6 @@ public: NS_IMETHOD GetThreadEventQueue(PRThread* aThread, nsIEventQueue** aResult) = 0; NS_IMETHOD ResolveEventQueue(nsIEventQueue* queueOrConstant, nsIEventQueue* *resultQueue) = 0; -#ifdef XP_MAC - NS_IMETHOD ProcessEvents() = 0; -#endif - }; #endif /* nsIEventQueueService_h___ */