Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 21:28:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 267352: make sure frame construction events are flushed before starting

Browse Source 
to print, to fix regression (form inputs print blank) from 228557. r=darin,
sr=jst, a=roc.
This commit is contained in:
shaver%mozilla.org 2004-11-17 16:38:01 +00:00
parent b216d4fa16
commit af61b217ff
2 changed files with 84 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
content/base/src/nsPrintEngine.cpp
View File

@ -67,6 +67,7 @@ static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printset
// Printing Events
#include "nsIEventQueue.h"
#include "nsIEventQueueService.h"
#include "nsEventQueueUtils.h"
#include "nsPrintPreviewListener.h"
// Printing
@ -2545,6 +2546,46 @@ nsPrintEngine::ReflowDocList(nsPrintObject* aPO, PRBool aSetPixelScale, PRBool a
return NS_OK;
}
PR_STATIC_CALLBACK(void *)
HandleBarrierEvent(PLEvent *aEvent)
{
PRBool *b = NS_STATIC_CAST(PRBool *, PL_GetEventOwner(aEvent));
*b = PR_TRUE;
return nsnull;
}
PR_STATIC_CALLBACK(void)
DestroyBarrierEvent(PLEvent *aEvent)
{
}
static void
FlushEventQueue()
{
PRBool hitBarrier = PR_FALSE;
nsCOMPtr<nsIEventQueue> eventQ;
nsresult rv = NS_GetMainEventQ(getter_AddRefs(eventQ));
if (NS_FAILED(rv))
return;
PLEvent evt;
PL_InitEvent(&evt, &hitBarrier, HandleBarrierEvent, DestroyBarrierEvent);
if (NS_FAILED(eventQ->PostEvent(&evt)))
return;
while (!hitBarrier) {
PLEvent *next;
eventQ->GetEvent(&next);
if (!next) {
NS_ERROR("barrier event not found!");
return;
}
eventQ->HandleEvent(next);
}
}
//-------------------------------------------------------
// Reflow a nsPrintObject
nsresult
@ -2756,6 +2797,7 @@ nsPrintEngine::ReflowPrintObject(nsPrintObject * aPO, PRBool aDoCalcShrink)
aPO->mPresContext->SetPageDim(adjRect);
rv = aPO->mPresShell->InitialReflow(width, height);
FlushEventQueue();
if (NS_SUCCEEDED(rv)) {
// Transfer Selection Ranges to the new Print PresShell
nsCOMPtr<nsISelection> selection;

42
layout/printing/nsPrintEngine.cpp
View File

@ -67,6 +67,7 @@ static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printset
// Printing Events
#include "nsIEventQueue.h"
#include "nsIEventQueueService.h"
#include "nsEventQueueUtils.h"
#include "nsPrintPreviewListener.h"
// Printing
@ -2545,6 +2546,46 @@ nsPrintEngine::ReflowDocList(nsPrintObject* aPO, PRBool aSetPixelScale, PRBool a
return NS_OK;
}
PR_STATIC_CALLBACK(void *)
HandleBarrierEvent(PLEvent *aEvent)
{
PRBool *b = NS_STATIC_CAST(PRBool *, PL_GetEventOwner(aEvent));
*b = PR_TRUE;
return nsnull;
}
PR_STATIC_CALLBACK(void)
DestroyBarrierEvent(PLEvent *aEvent)
{
}
static void
FlushEventQueue()
{
PRBool hitBarrier = PR_FALSE;
nsCOMPtr<nsIEventQueue> eventQ;
nsresult rv = NS_GetMainEventQ(getter_AddRefs(eventQ));
if (NS_FAILED(rv))
return;
PLEvent evt;
PL_InitEvent(&evt, &hitBarrier, HandleBarrierEvent, DestroyBarrierEvent);
if (NS_FAILED(eventQ->PostEvent(&evt)))
return;
while (!hitBarrier) {
PLEvent *next;
eventQ->GetEvent(&next);
if (!next) {
NS_ERROR("barrier event not found!");
return;
}
eventQ->HandleEvent(next);
}
}
//-------------------------------------------------------
// Reflow a nsPrintObject
nsresult
@ -2756,6 +2797,7 @@ nsPrintEngine::ReflowPrintObject(nsPrintObject * aPO, PRBool aDoCalcShrink)
aPO->mPresContext->SetPageDim(adjRect);
rv = aPO->mPresShell->InitialReflow(width, height);
FlushEventQueue();
if (NS_SUCCEEDED(rv)) {
// Transfer Selection Ranges to the new Print PresShell
nsCOMPtr<nsISelection> selection;