diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp index 2b4d311751ba..8c27cbfe7dc5 100644 --- a/layout/generic/nsPageFrame.cpp +++ b/layout/generic/nsPageFrame.cpp @@ -57,9 +57,8 @@ NS_METHOD nsPageFrame::Reflow(nsIPresContext& aPresContext, // Dispatch the reflow command to our content child. Allow it to be as high // as it wants nsSize maxSize(aReflowState.availableWidth, NS_UNCONSTRAINEDSIZE); - nsHTMLReflowState kidReflowState(aPresContext, mFrames.FirstChild(), - aReflowState, - maxSize); + nsHTMLReflowState kidReflowState(aPresContext, aReflowState, + mFrames.FirstChild(), maxSize); kidReflowState.isTopOfPage = PR_TRUE; ReflowChild(mFrames.FirstChild(), aPresContext, aDesiredSize, @@ -100,7 +99,7 @@ NS_METHOD nsPageFrame::Reflow(nsIPresContext& aPresContext, if (mFrames.NotEmpty()) { nsIFrame* frame = mFrames.FirstChild(); nsSize maxSize(aReflowState.availableWidth, aReflowState.availableHeight); - nsHTMLReflowState kidReflowState(aPresContext, frame, aReflowState, + nsHTMLReflowState kidReflowState(aPresContext, aReflowState, frame, maxSize); kidReflowState.isTopOfPage = PR_TRUE; @@ -153,6 +152,13 @@ nsPageFrame::GetFrameName(nsString& aResult) const return MakeFrameName("Page", aResult); } +NS_IMETHODIMP +nsPageFrame::IsPercentageBase(PRBool& aBase) const +{ + aBase = PR_TRUE; + return NS_OK; +} + //---------------------------------------------------------------------- nsresult diff --git a/layout/generic/nsPageFrame.h b/layout/generic/nsPageFrame.h index 9f38b7e266f5..ae074173777b 100644 --- a/layout/generic/nsPageFrame.h +++ b/layout/generic/nsPageFrame.h @@ -29,6 +29,7 @@ public: nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aMaxSize, nsReflowStatus& aStatus); + NS_IMETHOD IsPercentageBase(PRBool& aBase) const; /** * Get the "type" of the frame diff --git a/layout/html/base/src/nsPageFrame.cpp b/layout/html/base/src/nsPageFrame.cpp index 2b4d311751ba..8c27cbfe7dc5 100644 --- a/layout/html/base/src/nsPageFrame.cpp +++ b/layout/html/base/src/nsPageFrame.cpp @@ -57,9 +57,8 @@ NS_METHOD nsPageFrame::Reflow(nsIPresContext& aPresContext, // Dispatch the reflow command to our content child. Allow it to be as high // as it wants nsSize maxSize(aReflowState.availableWidth, NS_UNCONSTRAINEDSIZE); - nsHTMLReflowState kidReflowState(aPresContext, mFrames.FirstChild(), - aReflowState, - maxSize); + nsHTMLReflowState kidReflowState(aPresContext, aReflowState, + mFrames.FirstChild(), maxSize); kidReflowState.isTopOfPage = PR_TRUE; ReflowChild(mFrames.FirstChild(), aPresContext, aDesiredSize, @@ -100,7 +99,7 @@ NS_METHOD nsPageFrame::Reflow(nsIPresContext& aPresContext, if (mFrames.NotEmpty()) { nsIFrame* frame = mFrames.FirstChild(); nsSize maxSize(aReflowState.availableWidth, aReflowState.availableHeight); - nsHTMLReflowState kidReflowState(aPresContext, frame, aReflowState, + nsHTMLReflowState kidReflowState(aPresContext, aReflowState, frame, maxSize); kidReflowState.isTopOfPage = PR_TRUE; @@ -153,6 +152,13 @@ nsPageFrame::GetFrameName(nsString& aResult) const return MakeFrameName("Page", aResult); } +NS_IMETHODIMP +nsPageFrame::IsPercentageBase(PRBool& aBase) const +{ + aBase = PR_TRUE; + return NS_OK; +} + //---------------------------------------------------------------------- nsresult diff --git a/layout/html/base/src/nsPageFrame.h b/layout/html/base/src/nsPageFrame.h index 9f38b7e266f5..ae074173777b 100644 --- a/layout/html/base/src/nsPageFrame.h +++ b/layout/html/base/src/nsPageFrame.h @@ -29,6 +29,7 @@ public: nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aMaxSize, nsReflowStatus& aStatus); + NS_IMETHOD IsPercentageBase(PRBool& aBase) const; /** * Get the "type" of the frame