From f10d10eb501e69b241561b95ae238e18afff19ef Mon Sep 17 00:00:00 2001 From: kipp Date: Wed, 27 May 1998 21:06:03 +0000 Subject: [PATCH] Added DidFit/CanFit predicates; removed cruft git-svn-id: svn://10.0.0.236/trunk@2394 18797224-902f-48f8-a5cc-f745e15eee43 --- .../layout/html/base/src/deadnsInlineFrame.h | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/mozilla/layout/html/base/src/deadnsInlineFrame.h b/mozilla/layout/html/base/src/deadnsInlineFrame.h index 018cdab8f4b..a1c6423fbd1 100644 --- a/mozilla/layout/html/base/src/deadnsInlineFrame.h +++ b/mozilla/layout/html/base/src/deadnsInlineFrame.h @@ -23,8 +23,7 @@ class nsInlineState; // Inline container class. Does not support being used as a pseudo frame -class nsInlineFrame : public nsHTMLContainerFrame -{ +class nsInlineFrame : public nsHTMLContainerFrame { public: static nsresult NewFrame(nsIFrame** aInstancePtrResult, nsIContent* aContent, @@ -48,6 +47,15 @@ protected: void InitializeState(nsIPresContext* aPresContext, nsInlineState& aState); + PRBool DidFitChild(nsIPresContext* aPresContext, + nsInlineState& aState, + nsIFrame* aChildFrame, + nsReflowMetrics& aChildMetrics); + + PRBool CanFitChild(nsIPresContext* aPresContext, + nsInlineState& aState, + nsIFrame* aChildFrame); + void ComputeFinalSize(nsIPresContext* aPresContext, nsInlineState& aState, nsReflowMetrics& aSize); @@ -82,15 +90,6 @@ protected: nsInlineState& aState, nsIFrame* aChildFrame, PRInt32 aChildIndex); - -#if 0 - nsReflowStatus AdjustChildren(nsIPresContext* aPresContext, - nsReflowMetrics& aDesiredSize, - nsInlineState& aState, - nsIFrame* aKid, - nsReflowMetrics& aKidMetrics, - ReflowStatus aKidReflowStatus); -#endif }; #endif /* nsInlineFrame_h___ */