Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merging from previous threads branch

Browse Source 
git-svn-id: svn://10.0.0.236/branches/THREADS_20060307_BRANCH@192060 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%meer.net
2006-03-09 16:01:56 +00:00
parent af14cb27cd
commit fc0efc2ee0
291 changed files with 6554 additions and 8432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
mozilla/layout/forms/nsComboboxControlFrame.cpp
View File

@@ -97,47 +97,23 @@
#include "nsIFontMetrics.h"
#endif
static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
class RedisplayTextEvent : public PLEvent
class RedisplayTextEvent : public nsRunnable
{
public:
RedisplayTextEvent(nsComboboxControlFrame* aComboboxControlFrame);
RedisplayTextEvent(const nsComboboxControlFrameWeakRef &aControlFrame)
: mControlFrame(aControlFrame) {}
void HandleEvent()
NS_IMETHOD Run()
{
NS_STATIC_CAST(nsComboboxControlFrame*, owner) ->
HandleRedisplayTextEvent();
if (mControlFrame)
mControlFrame->HandleRedisplayTextEvent();
return NS_OK;
}
private:
nsComboboxControlFrameWeakRef mControlFrame;
};
PR_STATIC_CALLBACK(void*)
HandleRedisplayTextPLEvent(PLEvent* aEvent)
{
NS_ASSERTION(nsnull != aEvent, "Event is null");
RedisplayTextEvent* event = NS_STATIC_CAST(RedisplayTextEvent*, aEvent);
event->HandleEvent();
return nsnull;
}
PR_STATIC_CALLBACK(void)
DestroyRedisplayTextPLEvent(PLEvent* aEvent)
{
NS_ASSERTION(nsnull != aEvent, "Event is null");
RedisplayTextEvent* event = NS_STATIC_CAST(RedisplayTextEvent*, aEvent);
delete event;
}
RedisplayTextEvent::RedisplayTextEvent(nsComboboxControlFrame* aComboboxControlFrame)
{
PL_InitEvent(this, aComboboxControlFrame,
::HandleRedisplayTextPLEvent,
::DestroyRedisplayTextPLEvent);
}
class nsPresState;
#define FIX_FOR_BUG_53259
@@ -414,8 +390,6 @@ nsComboboxControlFrame::Init(nsPresContext* aPresContext,
nsStyleContext* aContext,
nsIFrame* aPrevInFlow)
{
mEventQueueService = do_GetService(kEventQueueServiceCID);
return nsAreaFrame::Init(aPresContext, aContent, aParent, aContext, aPrevInFlow);
}
@@ -1601,34 +1575,30 @@ nsComboboxControlFrame::RedisplayText(PRInt32 aIndex)
// Send reflow command because the new text maybe larger
nsresult rv = NS_OK;
if (mDisplayContent && mEventQueueService) {
if (mDisplayContent) {
// Don't call ActuallyDisplayText(PR_TRUE) directly here since that
// could cause recursive frame construction. See bug 283117 and the comment in
// HandleRedisplayTextEvent() below.
nsCOMPtr<nsIEventQueue> eventQueue;
rv = mEventQueueService->GetSpecialEventQueue(nsIEventQueueService::UI_THREAD_EVENT_QUEUE,
getter_AddRefs(eventQueue));
if (eventQueue) {
RedisplayTextEvent* event = new RedisplayTextEvent(this);
if (event) {
// Revoke outstanding events to avoid out-of-order events which could mean
// displaying the wrong text.
if (mRedisplayTextEventPosted) {
eventQueue->RevokeEvents(this);
mRedisplayTextEventPosted = PR_FALSE;
}
rv = eventQueue->PostEvent(event);
nsCOMPtr<nsIRunnable> event = new RedisplayTextEvent(mWeakSelf);
NS_ENSURE_TRUE(event, NS_ERROR_OUT_OF_MEMORY);
if (NS_SUCCEEDED(rv)) {
mRedisplayTextEventPosted = PR_TRUE;
} else {
PL_DestroyEvent(event);
}
} else {
rv = NS_ERROR_OUT_OF_MEMORY;
}
// Revoke outstanding events to avoid out-of-order events which could mean
// displaying the wrong text.
if (mRedisplayTextEventPosted) {
mWeakSelf.forget();
mRedisplayTextEventPosted = PR_FALSE;
}
if (!mWeakSelf) {
mWeakSelf = this;
if (!mWeakSelf)
return NS_ERROR_OUT_OF_MEMORY;
}
rv = NS_DispatchToCurrentThread(event);
if (NS_SUCCEEDED(rv))
mRedisplayTextEventPosted = PR_TRUE;
}
return rv;
}
@@ -1956,14 +1926,7 @@ NS_IMETHODIMP
nsComboboxControlFrame::Destroy(nsPresContext* aPresContext)
{
// Revoke queued RedisplayTextEvents
if (mEventQueueService) {
nsCOMPtr<nsIEventQueue> eventQueue;
mEventQueueService->GetSpecialEventQueue(nsIEventQueueService::UI_THREAD_EVENT_QUEUE,
getter_AddRefs(eventQueue));
if (eventQueue) {
eventQueue->RevokeEvents(this);
}
}
mWeakSelf.forget();
nsFormControlFrame::RegUnRegAccessKey(GetPresContext(), NS_STATIC_CAST(nsIFrame*, this), PR_FALSE);