diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index 3493e4b9d7b..b10e278a3c8 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -5109,6 +5109,14 @@ nsBlockFrame::ReflowFloat(nsBlockReflowState& aState,
     }
   }
 
+  if (floatFrame->GetType() == nsLayoutAtoms::letterFrame) {
+    // We never split floating first letters; an incomplete state for
+    // such frames simply means that there is more content to be
+    // reflowed on the line.
+    if (NS_FRAME_IS_NOT_COMPLETE(aReflowStatus)) 
+      aReflowStatus = NS_FRAME_COMPLETE;
+  }
+
   // Remove the float from the reflow tree.
   if (aState.mReflowState.path)
     aState.mReflowState.path->RemoveChild(floatFrame);
diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp
index d0a8e470526..d99f5c110b7 100644
--- a/mozilla/layout/generic/nsLineLayout.cpp
+++ b/mozilla/layout/generic/nsLineLayout.cpp
@@ -1014,11 +1014,6 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
         }
         if (outOfFlowFrame->GetType() == nsLayoutAtoms::letterFrame) {
           SetFlag(LL_FIRSTLETTERSTYLEOK, PR_FALSE);
-          // An incomplete reflow status means we should split the
-          // float if the height is constrained (bug 145305). We
-          // never split floating first letters.
-          if (NS_FRAME_IS_NOT_COMPLETE(aReflowStatus)) 
-            aReflowStatus = NS_FRAME_COMPLETE;
         }
       }
     }
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index 3493e4b9d7b..b10e278a3c8 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -5109,6 +5109,14 @@ nsBlockFrame::ReflowFloat(nsBlockReflowState& aState,
     }
   }
 
+  if (floatFrame->GetType() == nsLayoutAtoms::letterFrame) {
+    // We never split floating first letters; an incomplete state for
+    // such frames simply means that there is more content to be
+    // reflowed on the line.
+    if (NS_FRAME_IS_NOT_COMPLETE(aReflowStatus)) 
+      aReflowStatus = NS_FRAME_COMPLETE;
+  }
+
   // Remove the float from the reflow tree.
   if (aState.mReflowState.path)
     aState.mReflowState.path->RemoveChild(floatFrame);
diff --git a/mozilla/layout/html/base/src/nsLineLayout.cpp b/mozilla/layout/html/base/src/nsLineLayout.cpp
index d0a8e470526..d99f5c110b7 100644
--- a/mozilla/layout/html/base/src/nsLineLayout.cpp
+++ b/mozilla/layout/html/base/src/nsLineLayout.cpp
@@ -1014,11 +1014,6 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
         }
         if (outOfFlowFrame->GetType() == nsLayoutAtoms::letterFrame) {
           SetFlag(LL_FIRSTLETTERSTYLEOK, PR_FALSE);
-          // An incomplete reflow status means we should split the
-          // float if the height is constrained (bug 145305). We
-          // never split floating first letters.
-          if (NS_FRAME_IS_NOT_COMPLETE(aReflowStatus)) 
-            aReflowStatus = NS_FRAME_COMPLETE;
         }
       }
     }