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

Fix for bug 10818. r=troy. Add reflow batching APIs to the pres shell.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@58975 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nisheeth%netscape.com 2000-01-28 00:48:02 +00:00
parent 1e026205c5
commit 56e559d918
4 changed files with 102 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/layout/base/nsIPresShell.h
View File

@ -230,7 +230,7 @@ public:
*/
NS_IMETHOD AppendReflowCommand(nsIReflowCommand* aReflowCommand) = 0;
NS_IMETHOD CancelReflowCommand(nsIFrame* aTargetFrame, nsIReflowCommand::ReflowType* aCmdType) = 0;
NS_IMETHOD ProcessReflowCommands(PRBool aInterruptible) = 0;
NS_IMETHOD ProcessReflowCommands(PRBool aInterruptible) = 0;
NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame) = 0;
@ -370,11 +370,18 @@ public:
NS_IMETHOD GetReflowEventStatus(PRBool* aPending) = 0;
NS_IMETHOD SetReflowEventStatus(PRBool aPending) = 0;
/**
* Reflow batching
*/
NS_IMETHOD BeginBatchingReflows() = 0;
NS_IMETHOD EndBatchingReflows(PRBool aFlushPendingReflows) = 0;
NS_IMETHOD GetReflowBatchingStatus(PRBool* aIsBatching) = 0;
/**
* Flush all pending notifications such that the presentation is
* in sync with the content.
*/
NS_IMETHOD FlushPendingNotifications() = 0;
NS_IMETHOD FlushPendingNotifications() = 0;
/**
* See if reflow verification is enabled. To enable reflow verification add

46
mozilla/layout/base/nsPresShell.cpp
View File

@ -345,9 +345,17 @@ public:
NS_IMETHOD GetReflowEventStatus(PRBool* aPending);
NS_IMETHOD SetReflowEventStatus(PRBool aPending);
/**
* Reflow batching
*/
NS_IMETHOD BeginBatchingReflows();
NS_IMETHOD EndBatchingReflows(PRBool aFlushPendingReflows);
NS_IMETHOD GetReflowBatchingStatus(PRBool* aBatch);
NS_IMETHOD FlushPendingNotifications();
//nsIViewObserver interface
NS_IMETHOD Paint(nsIView *aView,
@ -481,6 +489,7 @@ protected:
FrameArena mFrameArena;
PRInt32 mAccumulatedReflowTime; // Time spent in reflow command processing so far
PRPackedBool mDocumentIsLoading; // A flag that is true while the document is loading.
PRPackedBool mBatchReflows; // When set to true, the pres shell batches reflow commands.
MOZ_TIMER_DECLARE(mReflowWatch) // Used for measuring time spent in reflow
MOZ_TIMER_DECLARE(mFrameCreationWatch) // Used for measuring time spent in frame creation
@ -611,6 +620,7 @@ PresShell::PresShell()
EnableScrolling();
mPendingReflowEvent = PR_FALSE;
mDocumentIsLoading = PR_TRUE;
mBatchReflows = PR_FALSE;
#ifdef DEBUG_nisheeth
mReflows = 0;
@ -829,7 +839,7 @@ NS_IMETHODIMP
PresShell::ExitReflowLock(PRBool aTryToReflow)
{
PRUint32 newReflowLockCount = mReflowLockCount - 1;
if (newReflowLockCount == 0 && aTryToReflow) {
if (newReflowLockCount == 0 && aTryToReflow && !mBatchReflows) {
/* If a) layout.reflow.async is true, OR
* b) layout.reflow.async.afterDocLoad is true AND the doc has finished loading
* Then
@ -1826,10 +1836,12 @@ struct ReflowEvent : public PLEvent {
printf("\n*** Handling reflow event: PresShell=%p, event=%p\n", presShell.get(), this);
}
#endif
PRBool isBatching;
presShell->SetReflowEventStatus(PR_FALSE);
presShell->EnterReflowLock();
presShell->ProcessReflowCommands(PR_TRUE);
presShell->ExitReflowLock(PR_FALSE);
presShell->GetReflowBatchingStatus(&isBatching);
if (!isBatching) presShell->ProcessReflowCommands(PR_TRUE);
presShell->ExitReflowLock(PR_FALSE);
}
else
mPresShell = 0;
@ -2384,6 +2396,32 @@ PresShell::SetReflowEventStatus(PRBool aPending)
return NS_OK;
}
NS_IMETHODIMP
PresShell::BeginBatchingReflows()
{
mBatchReflows = PR_TRUE;
return NS_OK;
}
NS_IMETHODIMP
PresShell::EndBatchingReflows(PRBool aFlushPendingReflows)
{
nsresult rv = NS_OK;
mBatchReflows = PR_FALSE;
if (aFlushPendingReflows) {
rv = FlushPendingNotifications();
}
return rv;
}
NS_IMETHODIMP
PresShell::GetReflowBatchingStatus(PRBool* aIsBatching)
{
*aIsBatching = mBatchReflows;
return NS_OK;
}
NS_IMETHODIMP
PresShell::FlushPendingNotifications()
{

11
mozilla/layout/base/public/nsIPresShell.h
View File

@ -230,7 +230,7 @@ public:
*/
NS_IMETHOD AppendReflowCommand(nsIReflowCommand* aReflowCommand) = 0;
NS_IMETHOD CancelReflowCommand(nsIFrame* aTargetFrame, nsIReflowCommand::ReflowType* aCmdType) = 0;
NS_IMETHOD ProcessReflowCommands(PRBool aInterruptible) = 0;
NS_IMETHOD ProcessReflowCommands(PRBool aInterruptible) = 0;
NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame) = 0;
@ -370,11 +370,18 @@ public:
NS_IMETHOD GetReflowEventStatus(PRBool* aPending) = 0;
NS_IMETHOD SetReflowEventStatus(PRBool aPending) = 0;
/**
* Reflow batching
*/
NS_IMETHOD BeginBatchingReflows() = 0;
NS_IMETHOD EndBatchingReflows(PRBool aFlushPendingReflows) = 0;
NS_IMETHOD GetReflowBatchingStatus(PRBool* aIsBatching) = 0;
/**
* Flush all pending notifications such that the presentation is
* in sync with the content.
*/
NS_IMETHOD FlushPendingNotifications() = 0;
NS_IMETHOD FlushPendingNotifications() = 0;
/**
* See if reflow verification is enabled. To enable reflow verification add

46
mozilla/layout/html/base/src/nsPresShell.cpp
View File

@ -345,9 +345,17 @@ public:
NS_IMETHOD GetReflowEventStatus(PRBool* aPending);
NS_IMETHOD SetReflowEventStatus(PRBool aPending);
/**
* Reflow batching
*/
NS_IMETHOD BeginBatchingReflows();
NS_IMETHOD EndBatchingReflows(PRBool aFlushPendingReflows);
NS_IMETHOD GetReflowBatchingStatus(PRBool* aBatch);
NS_IMETHOD FlushPendingNotifications();
//nsIViewObserver interface
NS_IMETHOD Paint(nsIView *aView,
@ -481,6 +489,7 @@ protected:
FrameArena mFrameArena;
PRInt32 mAccumulatedReflowTime; // Time spent in reflow command processing so far
PRPackedBool mDocumentIsLoading; // A flag that is true while the document is loading.
PRPackedBool mBatchReflows; // When set to true, the pres shell batches reflow commands.
MOZ_TIMER_DECLARE(mReflowWatch) // Used for measuring time spent in reflow
MOZ_TIMER_DECLARE(mFrameCreationWatch) // Used for measuring time spent in frame creation
@ -611,6 +620,7 @@ PresShell::PresShell()
EnableScrolling();
mPendingReflowEvent = PR_FALSE;
mDocumentIsLoading = PR_TRUE;
mBatchReflows = PR_FALSE;
#ifdef DEBUG_nisheeth
mReflows = 0;
@ -829,7 +839,7 @@ NS_IMETHODIMP
PresShell::ExitReflowLock(PRBool aTryToReflow)
{
PRUint32 newReflowLockCount = mReflowLockCount - 1;
if (newReflowLockCount == 0 && aTryToReflow) {
if (newReflowLockCount == 0 && aTryToReflow && !mBatchReflows) {
/* If a) layout.reflow.async is true, OR
* b) layout.reflow.async.afterDocLoad is true AND the doc has finished loading
* Then
@ -1826,10 +1836,12 @@ struct ReflowEvent : public PLEvent {
printf("\n*** Handling reflow event: PresShell=%p, event=%p\n", presShell.get(), this);
}
#endif
PRBool isBatching;
presShell->SetReflowEventStatus(PR_FALSE);
presShell->EnterReflowLock();
presShell->ProcessReflowCommands(PR_TRUE);
presShell->ExitReflowLock(PR_FALSE);
presShell->GetReflowBatchingStatus(&isBatching);
if (!isBatching) presShell->ProcessReflowCommands(PR_TRUE);
presShell->ExitReflowLock(PR_FALSE);
}
else
mPresShell = 0;
@ -2384,6 +2396,32 @@ PresShell::SetReflowEventStatus(PRBool aPending)
return NS_OK;
}
NS_IMETHODIMP
PresShell::BeginBatchingReflows()
{
mBatchReflows = PR_TRUE;
return NS_OK;
}
NS_IMETHODIMP
PresShell::EndBatchingReflows(PRBool aFlushPendingReflows)
{
nsresult rv = NS_OK;
mBatchReflows = PR_FALSE;
if (aFlushPendingReflows) {
rv = FlushPendingNotifications();
}
return rv;
}
NS_IMETHODIMP
PresShell::GetReflowBatchingStatus(PRBool* aIsBatching)
{
*aIsBatching = mBatchReflows;
return NS_OK;
}
NS_IMETHODIMP
PresShell::FlushPendingNotifications()
{