From 33be9dd48b427cd0ea8b6facfe9b22cb17e0a939 Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Thu, 23 Jul 1998 19:56:11 +0000 Subject: [PATCH] Removed hack reflow code now that body/block do it properly git-svn-id: svn://10.0.0.236/trunk@6295 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsPlaceholderFrame.cpp | 15 --------------- .../layout/html/base/src/nsPlaceholderFrame.cpp | 15 --------------- 2 files changed, 30 deletions(-) diff --git a/mozilla/layout/generic/nsPlaceholderFrame.cpp b/mozilla/layout/generic/nsPlaceholderFrame.cpp index 5050eb831dc..3a5ba276ccb 100644 --- a/mozilla/layout/generic/nsPlaceholderFrame.cpp +++ b/mozilla/layout/generic/nsPlaceholderFrame.cpp @@ -116,21 +116,6 @@ nsPlaceholderFrame::Reflow(nsIPresContext& aPresContext, // Notify our containing block that there's a new floater container->AddFloater(&aPresContext, aReflowState, mAnchoredItem, this); - - } else { - // XXX This causes anchored-items sizes to get fixed up; this is - // not quite right because this class should be implementing one - // of the incremental reflow methods and propagating things down - // properly to the contained frame. - nsReflowMetrics desiredSize(nsnull); - nsReflowState reflowState(mAnchoredItem, aReflowState, aReflowState.maxSize, - eReflowReason_Resize); - mAnchoredItem->WillReflow(aPresContext); - mAnchoredItem->Reflow(aPresContext, desiredSize, reflowState, aStatus); - mAnchoredItem->SizeTo(desiredSize.width, desiredSize.height); - -//XXXdeprecated container->PlaceFloater(aPresContext, mAnchoredItem, this); - mAnchoredItem->DidReflow(aPresContext, NS_FRAME_REFLOW_FINISHED); } if (nsIFrame::GetShowFrameBorders()) { diff --git a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp index 5050eb831dc..3a5ba276ccb 100644 --- a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp +++ b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp @@ -116,21 +116,6 @@ nsPlaceholderFrame::Reflow(nsIPresContext& aPresContext, // Notify our containing block that there's a new floater container->AddFloater(&aPresContext, aReflowState, mAnchoredItem, this); - - } else { - // XXX This causes anchored-items sizes to get fixed up; this is - // not quite right because this class should be implementing one - // of the incremental reflow methods and propagating things down - // properly to the contained frame. - nsReflowMetrics desiredSize(nsnull); - nsReflowState reflowState(mAnchoredItem, aReflowState, aReflowState.maxSize, - eReflowReason_Resize); - mAnchoredItem->WillReflow(aPresContext); - mAnchoredItem->Reflow(aPresContext, desiredSize, reflowState, aStatus); - mAnchoredItem->SizeTo(desiredSize.width, desiredSize.height); - -//XXXdeprecated container->PlaceFloater(aPresContext, mAnchoredItem, this); - mAnchoredItem->DidReflow(aPresContext, NS_FRAME_REFLOW_FINISHED); } if (nsIFrame::GetShowFrameBorders()) {