From 3cc6f3c021d830006765ade5898e40c1bec1f928 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 28 Nov 2005 22:18:23 +0000
Subject: [PATCH] Recover letter frames even if we didn't construct anything
 new.  Bug 317961, r+sr=dbaron

git-svn-id: svn://10.0.0.236/trunk@185343 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/base/nsCSSFrameConstructor.cpp | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index c208b455b55..7ab8e1cc141 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -8979,11 +8979,11 @@ nsCSSFrameConstructor::ContentAppended(nsIContent*     aContainer,
       AppendFrames(state, aContainer, parentFrame, firstAppendedFrame,
                    parentAfterFrame);
     }
+  }
 
-    // Recover first-letter frames
-    if (haveFirstLetterStyle) {
-      RecoverLetterFrames(state, containingBlock);
-    }
+  // Recover first-letter frames
+  if (haveFirstLetterStyle) {
+    RecoverLetterFrames(state, containingBlock);
   }
 
 #ifdef DEBUG
@@ -9537,12 +9537,6 @@ nsCSSFrameConstructor::ContentInserted(nsIContent*            aContainer,
       state.mFrameManager->InsertFrames(parentFrame,
                                         nsnull, prevSibling, newFrame);
     }
-
-    if (haveFirstLetterStyle) {
-      // Recover the letter frames for the containing block when
-      // it has first-letter style.
-      RecoverLetterFrames(state, state.mFloatedItems.containingBlock);
-    }
   }
   else {
     // we might have a caption treat it here
@@ -9566,6 +9560,12 @@ nsCSSFrameConstructor::ContentInserted(nsIContent*            aContainer,
     }
   }
 
+  if (haveFirstLetterStyle) {
+    // Recover the letter frames for the containing block when
+    // it has first-letter style.
+    RecoverLetterFrames(state, state.mFloatedItems.containingBlock);
+  }
+
 #ifdef DEBUG
   if (gReallyNoisyContentUpdates && parentFrame) {
     nsIFrameDebug* fdbg = nsnull;