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

bug 78291 - disable processing the dummy layout request during special table reflow command cancel, sr=attinasi

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@94890 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com 2001-05-14 14:37:13 +00:00
parent 58efd0fb66
commit 6b82fe01dc
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -858,7 +858,8 @@ public:
nsIReflowCommand::ReflowType* aCmdType);
NS_IMETHOD CancelReflowCommandInternal(nsIFrame* aTargetFrame,
nsIReflowCommand::ReflowType* aCmdType,
nsVoidArray& aQueue);
nsVoidArray& aQueue,
PRBool aProcessDummyLayoutRequest = PR_TRUE);
NS_IMETHOD CancelAllReflowCommands();
NS_IMETHOD IsSafeToFlush(PRBool& aIsSafeToFlush);
NS_IMETHOD FlushPendingNotifications();
@ -3515,9 +3516,10 @@ PresShell :: IsDragInProgress ( ) const
NS_IMETHODIMP
PresShell::CancelReflowCommandInternal(nsIFrame* aTargetFrame,
PresShell::CancelReflowCommandInternal(nsIFrame* aTargetFrame,
nsIReflowCommand::ReflowType* aCmdType,
nsVoidArray& aQueue)
nsVoidArray& aQueue,
PRBool aProcessDummyLayoutRequest)
{
PRInt32 i, n = aQueue.Count();
for (i = 0; i < n; i++) {
@ -3554,7 +3556,9 @@ PresShell::CancelReflowCommandInternal(nsIFrame* aTargetFrame,
}
}
DoneRemovingReflowCommands();
if (aProcessDummyLayoutRequest) {
DoneRemovingReflowCommands();
}
return NS_OK;
}
@ -5862,11 +5866,12 @@ PresShell::SendInterruptNotificationTo(nsIFrame* aFrame,
}
nsresult
PresShell::CancelInterruptNotificationTo(nsIFrame* aFrame,
nsIPresShell:: InterruptType aInterruptType)
PresShell::CancelInterruptNotificationTo(nsIFrame* aFrame,
nsIPresShell::InterruptType aInterruptType)
{
return CancelReflowCommandInternal(aFrame, nsnull, mTimeoutReflowCommands);
// cancel the reflow command without affecting the dummy layout request
return CancelReflowCommandInternal(aFrame, nsnull, mTimeoutReflowCommands, PR_FALSE);
}
nsresult

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

@ -858,7 +858,8 @@ public:
nsIReflowCommand::ReflowType* aCmdType);
NS_IMETHOD CancelReflowCommandInternal(nsIFrame* aTargetFrame,
nsIReflowCommand::ReflowType* aCmdType,
nsVoidArray& aQueue);
nsVoidArray& aQueue,
PRBool aProcessDummyLayoutRequest = PR_TRUE);
NS_IMETHOD CancelAllReflowCommands();
NS_IMETHOD IsSafeToFlush(PRBool& aIsSafeToFlush);
NS_IMETHOD FlushPendingNotifications();
@ -3515,9 +3516,10 @@ PresShell :: IsDragInProgress ( ) const
NS_IMETHODIMP
PresShell::CancelReflowCommandInternal(nsIFrame* aTargetFrame,
PresShell::CancelReflowCommandInternal(nsIFrame* aTargetFrame,
nsIReflowCommand::ReflowType* aCmdType,
nsVoidArray& aQueue)
nsVoidArray& aQueue,
PRBool aProcessDummyLayoutRequest)
{
PRInt32 i, n = aQueue.Count();
for (i = 0; i < n; i++) {
@ -3554,7 +3556,9 @@ PresShell::CancelReflowCommandInternal(nsIFrame* aTargetFrame,
}
}
DoneRemovingReflowCommands();
if (aProcessDummyLayoutRequest) {
DoneRemovingReflowCommands();
}
return NS_OK;
}
@ -5862,11 +5866,12 @@ PresShell::SendInterruptNotificationTo(nsIFrame* aFrame,
}
nsresult
PresShell::CancelInterruptNotificationTo(nsIFrame* aFrame,
nsIPresShell:: InterruptType aInterruptType)
PresShell::CancelInterruptNotificationTo(nsIFrame* aFrame,
nsIPresShell::InterruptType aInterruptType)
{
return CancelReflowCommandInternal(aFrame, nsnull, mTimeoutReflowCommands);
// cancel the reflow command without affecting the dummy layout request
return CancelReflowCommandInternal(aFrame, nsnull, mTimeoutReflowCommands, PR_FALSE);
}
nsresult