From 1f70a081a8de2e50b4b0fcfdfb9782503f261ae4 Mon Sep 17 00:00:00 2001
From: "roc+@cs.cmu.edu" <roc+@cs.cmu.edu>
Date: Sun, 20 Jan 2008 18:03:08 -0800
Subject: [PATCH] Bug 363391. nsSubdocumentFrame::Reflow should not call
 nsLeafFrame::Reflow directly because we don't want to call
 FinishAndStoreOverflow twice. patch by Andrew Smith, r+sr=roc

---
 layout/generic/nsFrameFrame.cpp |  4 ++--
 layout/generic/nsLeafFrame.cpp  | 16 ++++++++++++++--
 layout/generic/nsLeafFrame.h    |  8 ++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/layout/generic/nsFrameFrame.cpp b/layout/generic/nsFrameFrame.cpp
index cc6df7f1cfc..3c010c19c7e 100644
--- a/layout/generic/nsFrameFrame.cpp
+++ b/layout/generic/nsFrameFrame.cpp
@@ -486,8 +486,8 @@ nsSubDocumentFrame::Reflow(nsPresContext*          aPresContext,
   
   if (IsInline()) {
     // XUL <iframe> or <browser>, or HTML <iframe>, <object> or <embed>
-    nsresult rv = nsLeafFrame::Reflow(aPresContext, aDesiredSize, aReflowState,
-                                      aStatus);
+    nsresult rv = nsLeafFrame::DoReflow(aPresContext, aDesiredSize, aReflowState,
+                                        aStatus);
     NS_ENSURE_SUCCESS(rv, rv);
 
     offset = nsPoint(aReflowState.mComputedBorderPadding.left,
diff --git a/layout/generic/nsLeafFrame.cpp b/layout/generic/nsLeafFrame.cpp
index 2d21799cfd7..06aab0492fe 100644
--- a/layout/generic/nsLeafFrame.cpp
+++ b/layout/generic/nsLeafFrame.cpp
@@ -85,7 +85,19 @@ nsLeafFrame::Reflow(nsPresContext* aPresContext,
 
   NS_ASSERTION(aReflowState.ComputedWidth() != NS_UNCONSTRAINEDSIZE,
                "Shouldn't have unconstrained stuff here");
+  
+  DoReflow(aPresContext, aMetrics, aReflowState, aStatus);
 
+  FinishAndStoreOverflow(&aMetrics);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsLeafFrame::DoReflow(nsPresContext* aPresContext,
+                      nsHTMLReflowMetrics& aMetrics,
+                      const nsHTMLReflowState& aReflowState,
+                      nsReflowStatus& aStatus)
+{
   aMetrics.width = aReflowState.ComputedWidth();
   if (NS_INTRINSICSIZE != aReflowState.ComputedHeight()) {
     aMetrics.height = aReflowState.ComputedHeight();
@@ -101,13 +113,13 @@ nsLeafFrame::Reflow(nsPresContext* aPresContext,
   aStatus = NS_FRAME_COMPLETE;
 
   NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
-                 ("exit nsLeafFrame::Reflow: size=%d,%d",
+                 ("exit nsLeafFrame::DoReflow: size=%d,%d",
                   aMetrics.width, aMetrics.height));
   NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aMetrics);
 
   aMetrics.mOverflowArea =
     nsRect(0, 0, aMetrics.width, aMetrics.height);
-  FinishAndStoreOverflow(&aMetrics);
+  
   return NS_OK;
 }
 
diff --git a/layout/generic/nsLeafFrame.h b/layout/generic/nsLeafFrame.h
index c24fd0b68e8..6ca23fad7fc 100644
--- a/layout/generic/nsLeafFrame.h
+++ b/layout/generic/nsLeafFrame.h
@@ -77,6 +77,14 @@ public:
                     nsHTMLReflowMetrics& aDesiredSize,
                     const nsHTMLReflowState& aReflowState,
                     nsReflowStatus&      aStatus);
+  
+  /**
+   * This method does most of the work that Reflow() above need done.
+   */
+  NS_IMETHOD DoReflow(nsPresContext*      aPresContext,
+                      nsHTMLReflowMetrics& aDesiredSize,
+                      const nsHTMLReflowState& aReflowState,
+                      nsReflowStatus&      aStatus);
 
   virtual PRBool IsFrameOfType(PRUint32 aFlags) const
   {