From 0dfa8ffb990440b6d5379cedd657a48cd21f68f1 Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Tue, 10 Aug 1999 14:28:27 +0000 Subject: [PATCH] Fixed a place I had missed when converting over to the new reflow command handling git-svn-id: svn://10.0.0.236/trunk@42963 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsInlineFrame.cpp | 34 ++++++++++++------- .../layout/html/base/src/nsInlineFrame.cpp | 34 ++++++++++++------- 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp index a9b51ed4a90..62fc70926e5 100644 --- a/mozilla/layout/generic/nsInlineFrame.cpp +++ b/mozilla/layout/generic/nsInlineFrame.cpp @@ -93,13 +93,17 @@ nsPositionedInlineFrame::AppendFrames(nsIPresContext& aPresContext, nsIAtom* aListName, nsIFrame* aFrameList) { + nsresult rv; + if (nsLayoutAtoms::absoluteList == aListName) { - // XXX Temporary code until area frame is updated... - return nsFrame::AppendFrames(aPresContext, aPresShell, aListName, aFrameList); + rv = mAbsoluteContainer.AppendFrames(this, aPresContext, aPresShell, aListName, + aFrameList); + } else { + rv = nsInlineFrame::AppendFrames(aPresContext, aPresShell, aListName, + aFrameList); } - return nsInlineFrame::AppendFrames(aPresContext, aPresShell, aListName, - aFrameList); + return rv; } NS_IMETHODIMP @@ -109,14 +113,17 @@ nsPositionedInlineFrame::InsertFrames(nsIPresContext& aPresContext, nsIFrame* aPrevFrame, nsIFrame* aFrameList) { + nsresult rv; + if (nsLayoutAtoms::absoluteList == aListName) { - // XXX Temporary code until area frame is updated... - return nsFrame::InsertFrames(aPresContext, aPresShell, aListName, - aPrevFrame, aFrameList); + rv = mAbsoluteContainer.InsertFrames(this, aPresContext, aPresShell, aListName, + aPrevFrame, aFrameList); + } else { + rv = nsInlineFrame::InsertFrames(aPresContext, aPresShell, aListName, aPrevFrame, + aFrameList); } - return nsInlineFrame::InsertFrames(aPresContext, aPresShell, aListName, aPrevFrame, - aFrameList); + return rv; } NS_IMETHODIMP @@ -125,12 +132,15 @@ nsPositionedInlineFrame::RemoveFrame(nsIPresContext& aPresContext, nsIAtom* aListName, nsIFrame* aOldFrame) { + nsresult rv; + if (nsLayoutAtoms::absoluteList == aListName) { - // XXX Temporary code until area frame is updated... - return nsFrame::RemoveFrame(aPresContext, aPresShell, aListName, aOldFrame); + rv = mAbsoluteContainer.RemoveFrame(this, aPresContext, aPresShell, aListName, aOldFrame); + } else { + rv = nsInlineFrame::RemoveFrame(aPresContext, aPresShell, aListName, aOldFrame); } - return nsInlineFrame::RemoveFrame(aPresContext, aPresShell, aListName, aOldFrame); + return rv; } NS_IMETHODIMP diff --git a/mozilla/layout/html/base/src/nsInlineFrame.cpp b/mozilla/layout/html/base/src/nsInlineFrame.cpp index a9b51ed4a90..62fc70926e5 100644 --- a/mozilla/layout/html/base/src/nsInlineFrame.cpp +++ b/mozilla/layout/html/base/src/nsInlineFrame.cpp @@ -93,13 +93,17 @@ nsPositionedInlineFrame::AppendFrames(nsIPresContext& aPresContext, nsIAtom* aListName, nsIFrame* aFrameList) { + nsresult rv; + if (nsLayoutAtoms::absoluteList == aListName) { - // XXX Temporary code until area frame is updated... - return nsFrame::AppendFrames(aPresContext, aPresShell, aListName, aFrameList); + rv = mAbsoluteContainer.AppendFrames(this, aPresContext, aPresShell, aListName, + aFrameList); + } else { + rv = nsInlineFrame::AppendFrames(aPresContext, aPresShell, aListName, + aFrameList); } - return nsInlineFrame::AppendFrames(aPresContext, aPresShell, aListName, - aFrameList); + return rv; } NS_IMETHODIMP @@ -109,14 +113,17 @@ nsPositionedInlineFrame::InsertFrames(nsIPresContext& aPresContext, nsIFrame* aPrevFrame, nsIFrame* aFrameList) { + nsresult rv; + if (nsLayoutAtoms::absoluteList == aListName) { - // XXX Temporary code until area frame is updated... - return nsFrame::InsertFrames(aPresContext, aPresShell, aListName, - aPrevFrame, aFrameList); + rv = mAbsoluteContainer.InsertFrames(this, aPresContext, aPresShell, aListName, + aPrevFrame, aFrameList); + } else { + rv = nsInlineFrame::InsertFrames(aPresContext, aPresShell, aListName, aPrevFrame, + aFrameList); } - return nsInlineFrame::InsertFrames(aPresContext, aPresShell, aListName, aPrevFrame, - aFrameList); + return rv; } NS_IMETHODIMP @@ -125,12 +132,15 @@ nsPositionedInlineFrame::RemoveFrame(nsIPresContext& aPresContext, nsIAtom* aListName, nsIFrame* aOldFrame) { + nsresult rv; + if (nsLayoutAtoms::absoluteList == aListName) { - // XXX Temporary code until area frame is updated... - return nsFrame::RemoveFrame(aPresContext, aPresShell, aListName, aOldFrame); + rv = mAbsoluteContainer.RemoveFrame(this, aPresContext, aPresShell, aListName, aOldFrame); + } else { + rv = nsInlineFrame::RemoveFrame(aPresContext, aPresShell, aListName, aOldFrame); } - return nsInlineFrame::RemoveFrame(aPresContext, aPresShell, aListName, aOldFrame); + return rv; } NS_IMETHODIMP