From b14ed6de82e3feb4c8f63ea3732bed7b8f64a317 Mon Sep 17 00:00:00 2001
From: "dbaron%dbaron.org" <dbaron%dbaron.org>
Date: Fri, 26 Jan 2007 07:18:55 +0000
Subject: [PATCH] Merge 368101 with changes from bug 367442.

---
 layout/svg/base/src/nsSVGForeignObjectFrame.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layout/svg/base/src/nsSVGForeignObjectFrame.cpp b/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
index 4d8fb3d4a042..187b0029431e 100644
--- a/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
+++ b/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
@@ -152,14 +152,14 @@ nsSVGForeignObjectFrame::Reflow(nsPresContext*           aPresContext,
 {
   NS_ASSERTION(!aReflowState.parentReflowState,
                "should only get reflow from being reflow root");
-  NS_ASSERTION(aReflowState.mComputedWidth == GetSize().width &&
+  NS_ASSERTION(aReflowState.ComputedWidth() == GetSize().width &&
                aReflowState.mComputedHeight == GetSize().height,
                "reflow roots should be reflown at existing size and "
                "svg.css should ensure we have no padding/border/margin");
 
   DoReflow();
 
-  aDesiredSize.width = aReflowState.mComputedWidth;
+  aDesiredSize.width = aReflowState.ComputedWidth();
   aDesiredSize.height = aReflowState.mComputedHeight;
   aDesiredSize.mOverflowArea =
     nsRect(nsPoint(0, 0), nsSize(aDesiredSize.width, aDesiredSize.height));