corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create views when necessary

Browse Source
This commit is contained in:
kipp@netscape.com
1998-10-14 20:10:36 +00:00
parent 3bd593cd49
commit 6dd96d2ded
4 changed files with 82 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
layout/html/base/src/nsHTMLContainerFrame.cpp
View File

@@ -247,6 +247,7 @@ nsHTMLContainerFrame::CreateWrapperFrame(nsIPresContext& aPresContext,
return isContainer;
}
// XXX pass in aFrame's style context instead
PRBool
nsHTMLContainerFrame::MoveFrameOutOfFlow(nsIPresContext& aPresContext,
nsIFrame* aFrame,
@@ -269,6 +270,7 @@ nsHTMLContainerFrame::MoveFrameOutOfFlow(nsIPresContext& aPresContext,
aFrame->GetNextSibling(nextSibling);
aFrame->SetNextSibling(nsnull);
nsIFrame* frameToWrapWithAView = aFrame;
if (isFloated) {
// Create a placeholder frame that will serve as the anchor point.
nsPlaceholderFrame* placeholder =
@@ -279,6 +281,7 @@ nsHTMLContainerFrame::MoveFrameOutOfFlow(nsIPresContext& aPresContext,
if (CreateWrapperFrame(aPresContext, aFrame, wrapperFrame)) {
// Bind the wrapper frame to the placeholder
placeholder->SetAnchoredItem(wrapperFrame);
frameToWrapWithAView = wrapperFrame;
}
aPlaceholderFrame = placeholder;
@@ -293,11 +296,22 @@ nsHTMLContainerFrame::MoveFrameOutOfFlow(nsIPresContext& aPresContext,
if (CreateWrapperFrame(aPresContext, aFrame, wrapperFrame)) {
// Bind the wrapper frame to the placeholder
placeholder->SetAbsoluteFrame(wrapperFrame);
frameToWrapWithAView = wrapperFrame;
}
aPlaceholderFrame = placeholder;
}
// Wrap the frame in a view if necessary
nsIStyleContext* kidSC;
aFrame->GetStyleContext(&aPresContext, kidSC);
nsresult rv = CreateViewForFrame(aPresContext, frameToWrapWithAView,
kidSC, PR_FALSE);
NS_RELEASE(kidSC);
if (NS_OK != rv) {
return rv;
}
// Set the placeholder's next sibling to what aFrame's next sibling was
aPlaceholderFrame->SetNextSibling(nextSibling);
return PR_TRUE;