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;