diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index f7b68cba953..e6aecebc517 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -1057,6 +1057,10 @@ nsBlockFrame::PlaceAndReflowChild(nsIPresContext* aCX,
     }
 
     // Add block child
+    // XXX We need to set lastContentIsComplete here, because AddBlockChild()
+    // calls AdvaneceToNextLine(). We need to restructure the flow of control,
+    // and use a state machine...
+    aState.lastContentIsComplete = PRBool(status == frComplete);
     AddBlockChild(aCX, aState, kidFrame, kidRect, pKidMaxElementSize, kidMol);
   }
 
diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp
index f7b68cba953..e6aecebc517 100644
--- a/mozilla/layout/generic/nsBlockReflowState.cpp
+++ b/mozilla/layout/generic/nsBlockReflowState.cpp
@@ -1057,6 +1057,10 @@ nsBlockFrame::PlaceAndReflowChild(nsIPresContext* aCX,
     }
 
     // Add block child
+    // XXX We need to set lastContentIsComplete here, because AddBlockChild()
+    // calls AdvaneceToNextLine(). We need to restructure the flow of control,
+    // and use a state machine...
+    aState.lastContentIsComplete = PRBool(status == frComplete);
     AddBlockChild(aCX, aState, kidFrame, kidRect, pKidMaxElementSize, kidMol);
   }
 
diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h
index f7b68cba953..e6aecebc517 100644
--- a/mozilla/layout/generic/nsBlockReflowState.h
+++ b/mozilla/layout/generic/nsBlockReflowState.h
@@ -1057,6 +1057,10 @@ nsBlockFrame::PlaceAndReflowChild(nsIPresContext* aCX,
     }
 
     // Add block child
+    // XXX We need to set lastContentIsComplete here, because AddBlockChild()
+    // calls AdvaneceToNextLine(). We need to restructure the flow of control,
+    // and use a state machine...
+    aState.lastContentIsComplete = PRBool(status == frComplete);
     AddBlockChild(aCX, aState, kidFrame, kidRect, pKidMaxElementSize, kidMol);
   }
 
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index f7b68cba953..e6aecebc517 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -1057,6 +1057,10 @@ nsBlockFrame::PlaceAndReflowChild(nsIPresContext* aCX,
     }
 
     // Add block child
+    // XXX We need to set lastContentIsComplete here, because AddBlockChild()
+    // calls AdvaneceToNextLine(). We need to restructure the flow of control,
+    // and use a state machine...
+    aState.lastContentIsComplete = PRBool(status == frComplete);
     AddBlockChild(aCX, aState, kidFrame, kidRect, pKidMaxElementSize, kidMol);
   }
 
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
index f7b68cba953..e6aecebc517 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
@@ -1057,6 +1057,10 @@ nsBlockFrame::PlaceAndReflowChild(nsIPresContext* aCX,
     }
 
     // Add block child
+    // XXX We need to set lastContentIsComplete here, because AddBlockChild()
+    // calls AdvaneceToNextLine(). We need to restructure the flow of control,
+    // and use a state machine...
+    aState.lastContentIsComplete = PRBool(status == frComplete);
     AddBlockChild(aCX, aState, kidFrame, kidRect, pKidMaxElementSize, kidMol);
   }
 
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h
index f7b68cba953..e6aecebc517 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.h
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.h
@@ -1057,6 +1057,10 @@ nsBlockFrame::PlaceAndReflowChild(nsIPresContext* aCX,
     }
 
     // Add block child
+    // XXX We need to set lastContentIsComplete here, because AddBlockChild()
+    // calls AdvaneceToNextLine(). We need to restructure the flow of control,
+    // and use a state machine...
+    aState.lastContentIsComplete = PRBool(status == frComplete);
     AddBlockChild(aCX, aState, kidFrame, kidRect, pKidMaxElementSize, kidMol);
   }