From b08cebd76df69a140b2b71f6d2dcb83012605cb5 Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Fri, 20 Nov 1998 17:20:29 +0000 Subject: [PATCH] Use revised API's for computing the border/padding git-svn-id: svn://10.0.0.236/trunk@15013 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsHTMLFrame.cpp | 5 ++--- mozilla/layout/html/base/src/nsHTMLFrame.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mozilla/layout/generic/nsHTMLFrame.cpp b/mozilla/layout/generic/nsHTMLFrame.cpp index 9cc3ce8c189..4e5b8e0e0fd 100644 --- a/mozilla/layout/generic/nsHTMLFrame.cpp +++ b/mozilla/layout/generic/nsHTMLFrame.cpp @@ -180,10 +180,9 @@ RootFrame::Reflow(nsIPresContext& aPresContext, // Reflow our child frame if (nsnull != mFirstChild) { // Compute how much space to reserve for our border and padding - const nsStyleSpacing* spacing = - (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; - spacing->CalcBorderPaddingFor(this, borderPadding); + nsHTMLReflowState::ComputeBorderPaddingFor(this, nsnull, + borderPadding); nsSize kidMaxSize(reflowState.maxSize); kidMaxSize.width -= borderPadding.left + borderPadding.right; diff --git a/mozilla/layout/html/base/src/nsHTMLFrame.cpp b/mozilla/layout/html/base/src/nsHTMLFrame.cpp index 9cc3ce8c189..4e5b8e0e0fd 100644 --- a/mozilla/layout/html/base/src/nsHTMLFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLFrame.cpp @@ -180,10 +180,9 @@ RootFrame::Reflow(nsIPresContext& aPresContext, // Reflow our child frame if (nsnull != mFirstChild) { // Compute how much space to reserve for our border and padding - const nsStyleSpacing* spacing = - (const nsStyleSpacing*)mStyleContext->GetStyleData(eStyleStruct_Spacing); nsMargin borderPadding; - spacing->CalcBorderPaddingFor(this, borderPadding); + nsHTMLReflowState::ComputeBorderPaddingFor(this, nsnull, + borderPadding); nsSize kidMaxSize(reflowState.maxSize); kidMaxSize.width -= borderPadding.left + borderPadding.right;