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

fix for 22943. removing xp-mac specific code from xp interface, enabling asserts

Browse Source 
on the mac. r= sdagley
This commit is contained in:
dougt%netscape.com 2000-01-06 20:08:14 +00:00
parent dd0e047b8e
commit d887958ad4
4 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xpcom/threads/nsEventQueue.cpp
View File

@ -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;

30
xpcom/threads/nsEventQueueService.cpp
View File

@ -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

4
xpcom/threads/nsEventQueueService.h
View File

@ -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);

4
xpcom/threads/nsIEventQueueService.h
View File

@ -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___ */