diff --git a/mozilla/layout/generic/nsPlaceholderFrame.cpp b/mozilla/layout/generic/nsPlaceholderFrame.cpp
index c1b62f4ee1b..654e0c71666 100644
--- a/mozilla/layout/generic/nsPlaceholderFrame.cpp
+++ b/mozilla/layout/generic/nsPlaceholderFrame.cpp
@@ -25,7 +25,7 @@
 #include "nsIView.h"
 #include "nsHTMLIIDs.h"
 #include "nsIPresContext.h"
-#include "nsCSSLineLayout.h"
+#include "nsCSSBlockFrame.h"
 
 nsresult
 nsPlaceholderFrame::NewFrame(nsIFrame**  aInstancePtrResult,
@@ -142,6 +142,9 @@ nsPlaceholderFrame::InlineReflow(nsCSSLineLayout&     aLineLayout,
     container->AddFloater(&presContext, aReflowState, mAnchoredItem, this);
   }
 
+  // Let line layout know about the floater
+  aLineLayout.AddFloater(this);
+
   aDesiredSize.width = 0;
   aDesiredSize.height = 0;
   aDesiredSize.ascent = 0;
diff --git a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp
index c1b62f4ee1b..654e0c71666 100644
--- a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp
+++ b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp
@@ -25,7 +25,7 @@
 #include "nsIView.h"
 #include "nsHTMLIIDs.h"
 #include "nsIPresContext.h"
-#include "nsCSSLineLayout.h"
+#include "nsCSSBlockFrame.h"
 
 nsresult
 nsPlaceholderFrame::NewFrame(nsIFrame**  aInstancePtrResult,
@@ -142,6 +142,9 @@ nsPlaceholderFrame::InlineReflow(nsCSSLineLayout&     aLineLayout,
     container->AddFloater(&presContext, aReflowState, mAnchoredItem, this);
   }
 
+  // Let line layout know about the floater
+  aLineLayout.AddFloater(this);
+
   aDesiredSize.width = 0;
   aDesiredSize.height = 0;
   aDesiredSize.ascent = 0;