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

Add in will/did reflow calls; add in tracing calls too

Browse Source
This commit is contained in:
kipp 1998-05-20 16:28:05 +00:00
parent bd4c33187c
commit a2e476cd11
4 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/generic/nsPageFrame.cpp
View File

@ -93,6 +93,7 @@ NS_METHOD PageFrame::ResizeReflow(nsIPresContext* aPresContext,
// XXX Pay attention to the page's border and padding...
if (nsnull != mFirstChild) {
// Get the child's desired size
mFirstChild->WillReflow(*aPresContext);
aStatus = ReflowChild(mFirstChild, aPresContext, aDesiredSize, aMaxSize,
aMaxElementSize);
mLastContentIsComplete = NS_FRAME_IS_COMPLETE(aStatus);
@ -105,6 +106,7 @@ NS_METHOD PageFrame::ResizeReflow(nsIPresContext* aPresContext,
// Place and size the child
nsRect rect(0, 0, aDesiredSize.width, aDesiredSize.height);
mFirstChild->SetRect(rect);
mFirstChild->DidReflow(*aPresContext, NS_FRAME_REFLOW_FINISHED);
// Is the frame complete?
if (NS_FRAME_IS_COMPLETE(aStatus)) {

11
layout/html/base/src/nsBodyFrame.cpp
View File

@ -137,6 +137,8 @@ NS_METHOD nsBodyFrame::ResizeReflow(nsIPresContext* aPresContext,
nsSize* aMaxElementSize,
nsReflowStatus& aStatus)
{
NS_FRAME_TRACE_REFLOW_IN("nsBodyFrame::ResizeReflow");
aStatus = NS_FRAME_COMPLETE; // initialize out parameter
// Do we have any children?
@ -172,6 +174,7 @@ NS_METHOD nsBodyFrame::ResizeReflow(nsIPresContext* aPresContext,
nsRect desiredRect;
nsIRunaround* reflowRunaround;
mFirstChild->WillReflow(*aPresContext);
mSpaceManager->Translate(leftInset, topInset);
mFirstChild->QueryInterface(kIRunaroundIID, (void**)&reflowRunaround);
reflowRunaround->ResizeReflow(aPresContext, mSpaceManager, columnMaxSize,
@ -194,6 +197,7 @@ NS_METHOD nsBodyFrame::ResizeReflow(nsIPresContext* aPresContext,
desiredRect.x += leftInset;
desiredRect.y += topInset;
mFirstChild->SetRect(desiredRect);
mFirstChild->DidReflow(*aPresContext, NS_FRAME_REFLOW_FINISHED);
// Set our last content offset and whether the last content is complete
// based on the state of the pseudo frame
@ -204,6 +208,7 @@ NS_METHOD nsBodyFrame::ResizeReflow(nsIPresContext* aPresContext,
isPseudoFrame, aDesiredSize);
}
NS_FRAME_TRACE_REFLOW_OUT("nsBodyFrame::ResizeReflow", aStatus);
return NS_OK;
}
@ -254,6 +259,8 @@ NS_METHOD nsBodyFrame::IncrementalReflow(nsIPresContext* aPresContext,
nsReflowCommand& aReflowCommand,
nsReflowStatus& aStatus)
{
NS_FRAME_TRACE_REFLOW_IN("nsBodyFrame::IncrementalReflow");
// Get our border/padding info
nsStyleSpacing* mySpacing =
(nsStyleSpacing*)mStyleContext->GetData(kStyleSpacingSID);
@ -282,6 +289,7 @@ NS_METHOD nsBodyFrame::IncrementalReflow(nsIPresContext* aPresContext,
nsIFrame* nextFrame;
NS_ASSERTION(nsnull != mFirstChild, "no first child");
mFirstChild->WillReflow(*aPresContext);
aStatus = aReflowCommand.Next(mSpaceManager, desiredRect, columnMaxSize,
nextFrame);
@ -289,6 +297,7 @@ NS_METHOD nsBodyFrame::IncrementalReflow(nsIPresContext* aPresContext,
desiredRect.x += leftInset;
desiredRect.y += topInset;
mFirstChild->SetRect(desiredRect);
mFirstChild->DidReflow(*aPresContext, NS_FRAME_REFLOW_FINISHED);
// Set our last content offset and whether the last content is complete
// based on the state of the pseudo frame
@ -299,6 +308,8 @@ NS_METHOD nsBodyFrame::IncrementalReflow(nsIPresContext* aPresContext,
isPseudoFrame, aDesiredSize);
mSpaceManager->Translate(-leftInset, -topInset);
NS_FRAME_TRACE_REFLOW_OUT("nsBodyFrame::IncrementalReflow", aStatus);
return NS_OK;
}

2
layout/html/base/src/nsPageFrame.cpp
View File

@ -93,6 +93,7 @@ NS_METHOD PageFrame::ResizeReflow(nsIPresContext* aPresContext,
// XXX Pay attention to the page's border and padding...
if (nsnull != mFirstChild) {
// Get the child's desired size
mFirstChild->WillReflow(*aPresContext);
aStatus = ReflowChild(mFirstChild, aPresContext, aDesiredSize, aMaxSize,
aMaxElementSize);
mLastContentIsComplete = NS_FRAME_IS_COMPLETE(aStatus);
@ -105,6 +106,7 @@ NS_METHOD PageFrame::ResizeReflow(nsIPresContext* aPresContext,
// Place and size the child
nsRect rect(0, 0, aDesiredSize.width, aDesiredSize.height);
mFirstChild->SetRect(rect);
mFirstChild->DidReflow(*aPresContext, NS_FRAME_REFLOW_FINISHED);
// Is the frame complete?
if (NS_FRAME_IS_COMPLETE(aStatus)) {

25
layout/html/base/src/nsRootPart.cpp
View File

@ -95,6 +95,8 @@ NS_METHOD RootFrame::ResizeReflow(nsIPresContext* aPresContext,
nsSize* aMaxElementSize,
nsReflowStatus& aStatus)
{
NS_FRAME_TRACE_REFLOW_IN("RootFrame::ResizeReflow");
#ifdef NS_DEBUG
PreReflowCheck();
#endif
@ -115,12 +117,14 @@ NS_METHOD RootFrame::ResizeReflow(nsIPresContext* aPresContext,
if (nsnull != mFirstChild) {
nsReflowMetrics desiredSize;
mFirstChild->WillReflow(*aPresContext);
aStatus = ReflowChild(mFirstChild, aPresContext, desiredSize, aMaxSize,
aMaxElementSize);
// Place and size the child
nsRect rect(0, 0, desiredSize.width, desiredSize.height);
mFirstChild->SetRect(rect);
mFirstChild->DidReflow(*aPresContext, NS_FRAME_REFLOW_FINISHED);
}
mLastContentOffset = ((RootContentFrame*)mFirstChild)->GetLastContentOffset();
@ -133,6 +137,8 @@ NS_METHOD RootFrame::ResizeReflow(nsIPresContext* aPresContext,
#ifdef NS_DEBUG
PostReflowCheck(aStatus);
#endif
NS_FRAME_TRACE_REFLOW_OUT("RootFrame::ResizeReflow", aStatus);
return NS_OK;
}
@ -142,6 +148,8 @@ NS_METHOD RootFrame::IncrementalReflow(nsIPresContext* aPresContext,
nsReflowCommand& aReflowCommand,
nsReflowStatus& aStatus)
{
NS_FRAME_TRACE_REFLOW_IN("RootFrame::IncrementalReflow");
// We don't expect the target of the reflow command to be the root frame
NS_ASSERTION(aReflowCommand.GetTarget() != this, "root frame is reflow command target");
@ -149,6 +157,7 @@ NS_METHOD RootFrame::IncrementalReflow(nsIPresContext* aPresContext,
nsIFrame* child;
// Dispatch the reflow command to our pseudo frame
mFirstChild->WillReflow(*aPresContext);
aStatus = aReflowCommand.Next(desiredSize, aMaxSize, child);
// Place and size the child
@ -157,6 +166,7 @@ NS_METHOD RootFrame::IncrementalReflow(nsIPresContext* aPresContext,
nsRect rect(0, 0, desiredSize.width, desiredSize.height);
child->SetRect(rect);
child->DidReflow(*aPresContext, NS_FRAME_REFLOW_FINISHED);
}
// Return the max size as our desired size
@ -164,6 +174,8 @@ NS_METHOD RootFrame::IncrementalReflow(nsIPresContext* aPresContext,
aDesiredSize.height = aMaxSize.height;
aDesiredSize.ascent = aMaxSize.height;
aDesiredSize.descent = 0;
NS_FRAME_TRACE_REFLOW_OUT("RootFrame::IncrementalReflow", aStatus);
return NS_OK;
}
@ -294,6 +306,8 @@ NS_METHOD RootContentFrame::ResizeReflow(nsIPresContext* aPresContext,
nsSize* aMaxElementSize,
nsReflowStatus& aStatus)
{
NS_FRAME_TRACE_REFLOW_IN("RootContentFrame::ResizeReflow");
#ifdef NS_DEBUG
PreReflowCheck();
#endif
@ -316,6 +330,7 @@ NS_METHOD RootContentFrame::ResizeReflow(nsIPresContext* aPresContext,
// Tile the pages vertically
for (nsIFrame* kidFrame = mFirstChild; nsnull != kidFrame; ) {
// Reflow the page
kidFrame->WillReflow(*aPresContext);
nsReflowStatus status = ReflowChild(kidFrame, aPresContext, kidSize,
pageSize, aMaxElementSize);
@ -325,6 +340,7 @@ NS_METHOD RootContentFrame::ResizeReflow(nsIPresContext* aPresContext,
PRInt32 extra = aMaxSize.width - kidSize.width - NS_TO_INT_ROUND(dx->GetScrollBarWidth());
NS_RELEASE(dx);
kidFrame->SetRect(nsRect(extra > 0 ? extra / 2 : 0, y, kidSize.width, kidSize.height));
kidFrame->DidReflow(*aPresContext, NS_FRAME_REFLOW_FINISHED);
y += kidSize.height;
// Leave a slight gap between the pages
@ -372,6 +388,7 @@ NS_METHOD RootContentFrame::ResizeReflow(nsIPresContext* aPresContext,
// Get the child's desired size. Our child's desired height is our
// desired size
mFirstChild->WillReflow(*aPresContext);
aStatus = ReflowChild(mFirstChild, aPresContext, aDesiredSize, maxSize,
aMaxElementSize);
NS_ASSERTION(NS_FRAME_IS_COMPLETE(aStatus), "bad status");
@ -385,12 +402,15 @@ NS_METHOD RootContentFrame::ResizeReflow(nsIPresContext* aPresContext,
// Place and size the child
nsRect rect(0, 0, aDesiredSize.width, aDesiredSize.height);
mFirstChild->SetRect(rect);
mFirstChild->DidReflow(*aPresContext, NS_FRAME_REFLOW_FINISHED);
}
}
#ifdef NS_DEBUG
PostReflowCheck(aStatus);
#endif
NS_FRAME_TRACE_REFLOW_OUT("RootContentFrame::ResizeReflow", aStatus);
return NS_OK;
}
@ -401,6 +421,8 @@ NS_METHOD RootContentFrame::IncrementalReflow(nsIPresContext* aPresContext,
nsReflowCommand& aReflowCommand,
nsReflowStatus& aStatus)
{
NS_FRAME_TRACE_REFLOW_IN("RootContentFrame::IncrementalReflow");
// We don't expect the target of the reflow command to be the root
// content frame
NS_ASSERTION(aReflowCommand.GetTarget() != this, "root content frame is reflow command target");
@ -410,6 +432,7 @@ NS_METHOD RootContentFrame::IncrementalReflow(nsIPresContext* aPresContext,
// Dispatch the reflow command to our pseudo frame. Allow it to be as high
// as it wants
mFirstChild->WillReflow(*aPresContext);
aStatus = aReflowCommand.Next(aDesiredSize, maxSize, child);
// Place and size the child. Make sure the child is at least as
@ -422,8 +445,10 @@ NS_METHOD RootContentFrame::IncrementalReflow(nsIPresContext* aPresContext,
nsRect rect(0, 0, aDesiredSize.width, aDesiredSize.height);
child->SetRect(rect);
child->DidReflow(*aPresContext, NS_FRAME_REFLOW_FINISHED);
}
NS_FRAME_TRACE_REFLOW_OUT("RootContentFrame::IncrementalReflow", aStatus);
return NS_OK;
}