From c63ad2aed0835f3d5de03951bbf51d41a9fe55cd Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Tue, 4 Aug 1998 21:16:32 +0000 Subject: [PATCH] Tell line layout about floater git-svn-id: svn://10.0.0.236/trunk@7262 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsPlaceholderFrame.cpp | 5 ++++- mozilla/layout/html/base/src/nsPlaceholderFrame.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) 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;