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

Added an nsIPresContext& to html-reflow-state's ctors and used it to implement better percentage width/height handling

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@12575 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1998-10-12 14:48:02 +00:00
parent 8e2e7cc31d
commit 3af8f78a16
52 changed files with 871 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/layout/html/base/src/nsHTMLFrame.cpp
View File

@@ -147,8 +147,9 @@ RootFrame::Reflow(nsIPresContext& aPresContext,
// wants
if (nsnull != mFirstChild) {
nsHTMLReflowMetrics desiredSize(nsnull);
nsHTMLReflowState kidReflowState(mFirstChild, aReflowState, aReflowState.maxSize);
nsIHTMLReflow* htmlReflow;
nsHTMLReflowState kidReflowState(aPresContext, mFirstChild, aReflowState,
aReflowState.maxSize);
nsIHTMLReflow* htmlReflow;
if (NS_OK == mFirstChild->QueryInterface(kIHTMLReflowIID, (void**)&htmlReflow)) {
ReflowChild(mFirstChild, aPresContext, desiredSize, kidReflowState, aStatus);
@@ -364,7 +365,8 @@ RootContentFrame::Reflow(nsIPresContext& aPresContext,
NS_ASSERTION(next == mFirstChild, "unexpected next reflow command frame");
nsSize maxSize(availWidth, NS_UNCONSTRAINEDSIZE);
nsHTMLReflowState kidReflowState(next, aReflowState, maxSize);
nsHTMLReflowState kidReflowState(aPresContext, next, aReflowState,
maxSize);
// Dispatch the reflow command to our child frame. Allow it to be as high
// as it wants
@@ -411,7 +413,8 @@ RootContentFrame::Reflow(nsIPresContext& aPresContext,
// Tile the pages vertically
for (nsIFrame* kidFrame = mFirstChild; nsnull != kidFrame; ) {
// Reflow the page
nsHTMLReflowState kidReflowState(kidFrame, aReflowState, pageSize,
nsHTMLReflowState kidReflowState(aPresContext, kidFrame,
aReflowState, pageSize,
reflowReason);
nsReflowStatus status;
@@ -466,7 +469,8 @@ RootContentFrame::Reflow(nsIPresContext& aPresContext,
} else {
nsSize maxSize(availWidth, NS_UNCONSTRAINEDSIZE);
nsHTMLReflowState kidReflowState(mFirstChild, aReflowState, maxSize,
nsHTMLReflowState kidReflowState(aPresContext, mFirstChild,
aReflowState, maxSize,
reflowReason);
// Get the child's desired size. Our child's desired height is our