From e8e77859cbef65b5fcfbbbb43e532a1484b0c5a0 Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Tue, 17 Nov 1998 01:03:41 +0000 Subject: [PATCH] Removed DidReflow hack again git-svn-id: svn://10.0.0.236/trunk@14770 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsPlaceholderFrame.cpp | 16 ---------------- mozilla/layout/generic/nsPlaceholderFrame.h | 3 --- .../layout/html/base/src/nsPlaceholderFrame.cpp | 16 ---------------- .../layout/html/base/src/nsPlaceholderFrame.h | 3 --- 4 files changed, 38 deletions(-) diff --git a/mozilla/layout/generic/nsPlaceholderFrame.cpp b/mozilla/layout/generic/nsPlaceholderFrame.cpp index 2de6a671721..ac3f10acb74 100644 --- a/mozilla/layout/generic/nsPlaceholderFrame.cpp +++ b/mozilla/layout/generic/nsPlaceholderFrame.cpp @@ -54,22 +54,6 @@ nsPlaceholderFrame::~nsPlaceholderFrame() { } -// XXX Major hack... -NS_IMETHODIMP -nsPlaceholderFrame::DidReflow(nsIPresContext& aPresContext, nsDidReflowStatus aStatus) -{ - // XXX Floated frames aren't being returned by block's FirstChild() member function - // so make sure they get a DidReflow notification - if (nsnull != mAnchoredItem) { - nsIHTMLReflow* htmlReflow; - if (NS_SUCCEEDED(mAnchoredItem->QueryInterface(kIHTMLReflowIID, (void**)&htmlReflow))) { - htmlReflow->DidReflow(aPresContext, aStatus); - } - } - - return nsFrame::DidReflow(aPresContext, aStatus); -} - NS_IMETHODIMP nsPlaceholderFrame::Reflow(nsIPresContext& aPresContext, nsHTMLReflowMetrics& aDesiredSize, diff --git a/mozilla/layout/generic/nsPlaceholderFrame.h b/mozilla/layout/generic/nsPlaceholderFrame.h index c1ff437d07f..884ce6dc4d5 100644 --- a/mozilla/layout/generic/nsPlaceholderFrame.h +++ b/mozilla/layout/generic/nsPlaceholderFrame.h @@ -48,9 +48,6 @@ public: nsReflowStatus& aStatus); // nsIFrame overrides - NS_IMETHOD DidReflow(nsIPresContext& aPresContext, - nsDidReflowStatus aStatus); - NS_IMETHOD Paint(nsIPresContext& aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect); diff --git a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp index 2de6a671721..ac3f10acb74 100644 --- a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp +++ b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp @@ -54,22 +54,6 @@ nsPlaceholderFrame::~nsPlaceholderFrame() { } -// XXX Major hack... -NS_IMETHODIMP -nsPlaceholderFrame::DidReflow(nsIPresContext& aPresContext, nsDidReflowStatus aStatus) -{ - // XXX Floated frames aren't being returned by block's FirstChild() member function - // so make sure they get a DidReflow notification - if (nsnull != mAnchoredItem) { - nsIHTMLReflow* htmlReflow; - if (NS_SUCCEEDED(mAnchoredItem->QueryInterface(kIHTMLReflowIID, (void**)&htmlReflow))) { - htmlReflow->DidReflow(aPresContext, aStatus); - } - } - - return nsFrame::DidReflow(aPresContext, aStatus); -} - NS_IMETHODIMP nsPlaceholderFrame::Reflow(nsIPresContext& aPresContext, nsHTMLReflowMetrics& aDesiredSize, diff --git a/mozilla/layout/html/base/src/nsPlaceholderFrame.h b/mozilla/layout/html/base/src/nsPlaceholderFrame.h index c1ff437d07f..884ce6dc4d5 100644 --- a/mozilla/layout/html/base/src/nsPlaceholderFrame.h +++ b/mozilla/layout/html/base/src/nsPlaceholderFrame.h @@ -48,9 +48,6 @@ public: nsReflowStatus& aStatus); // nsIFrame overrides - NS_IMETHOD DidReflow(nsIPresContext& aPresContext, - nsDidReflowStatus aStatus); - NS_IMETHOD Paint(nsIPresContext& aPresContext, nsIRenderingContext& aRenderingContext, const nsRect& aDirtyRect);