From bad84e485e42335f6f16f5ba80832c0b2974d55f Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Fri, 5 Mar 1999 04:22:54 +0000 Subject: [PATCH] Removed dead code; output rects naturally git-svn-id: svn://10.0.0.236/trunk@22840 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsContainerFrame.cpp | 20 +------------------ mozilla/layout/generic/nsFrame.cpp | 16 +-------------- .../layout/html/base/src/nsContainerFrame.cpp | 20 +------------------ mozilla/layout/html/base/src/nsFrame.cpp | 16 +-------------- 4 files changed, 4 insertions(+), 68 deletions(-) diff --git a/mozilla/layout/generic/nsContainerFrame.cpp b/mozilla/layout/generic/nsContainerFrame.cpp index cee194c53ae..37ef186cf40 100644 --- a/mozilla/layout/generic/nsContainerFrame.cpp +++ b/mozilla/layout/generic/nsContainerFrame.cpp @@ -547,38 +547,20 @@ nsContainerFrame::RemoveAFrame(nsIFrame* aRemovedFrame) NS_IMETHODIMP nsContainerFrame::List(FILE* out, PRInt32 aIndent) const { - nsAutoString tagString; - if (nsnull != mContent) { - nsIAtom* tag; - mContent->GetTag(tag); - if (tag != nsnull) { - tag->ToString(tagString); - NS_RELEASE(tag); - } - } - - // Indent IndentBy(out, aIndent); - - // Output the tag ListTag(out); - nsIView* view; GetView(&view); if (nsnull != view) { fprintf(out, " [view=%p]", view); } - if (nsnull != mPrevInFlow) { fprintf(out, " prev-in-flow=%p", mPrevInFlow); } if (nsnull != mNextInFlow) { fprintf(out, " next-in-flow=%p", mNextInFlow); } - - // Output the rect - out << mRect; - + fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height); if (0 != mState) { fprintf(out, " [state=%08x]", mState); } diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index e6e83abff25..26b36200501 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -1345,26 +1345,12 @@ PRInt32 nsFrame::ContentIndexInContainer(const nsIFrame* aFrame) NS_IMETHODIMP nsFrame::List(FILE* out, PRInt32 aIndent) const { - nsAutoString tagString; - if (nsnull != mContent) { - nsIAtom* tag; - mContent->GetTag(tag); - if (tag != nsnull) { - tag->ToString(tagString); - NS_RELEASE(tag); - } - } - - // Indent IndentBy(out, aIndent); - - // Output the tag and rect ListTag(out); if (nsnull != mView) { fprintf(out, " [view=%p]", mView); } - fputs(" ", out); - out << mRect; + fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height); if (0 != mState) { fprintf(out, " [state=%08x]", mState); } diff --git a/mozilla/layout/html/base/src/nsContainerFrame.cpp b/mozilla/layout/html/base/src/nsContainerFrame.cpp index cee194c53ae..37ef186cf40 100644 --- a/mozilla/layout/html/base/src/nsContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsContainerFrame.cpp @@ -547,38 +547,20 @@ nsContainerFrame::RemoveAFrame(nsIFrame* aRemovedFrame) NS_IMETHODIMP nsContainerFrame::List(FILE* out, PRInt32 aIndent) const { - nsAutoString tagString; - if (nsnull != mContent) { - nsIAtom* tag; - mContent->GetTag(tag); - if (tag != nsnull) { - tag->ToString(tagString); - NS_RELEASE(tag); - } - } - - // Indent IndentBy(out, aIndent); - - // Output the tag ListTag(out); - nsIView* view; GetView(&view); if (nsnull != view) { fprintf(out, " [view=%p]", view); } - if (nsnull != mPrevInFlow) { fprintf(out, " prev-in-flow=%p", mPrevInFlow); } if (nsnull != mNextInFlow) { fprintf(out, " next-in-flow=%p", mNextInFlow); } - - // Output the rect - out << mRect; - + fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height); if (0 != mState) { fprintf(out, " [state=%08x]", mState); } diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index e6e83abff25..26b36200501 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -1345,26 +1345,12 @@ PRInt32 nsFrame::ContentIndexInContainer(const nsIFrame* aFrame) NS_IMETHODIMP nsFrame::List(FILE* out, PRInt32 aIndent) const { - nsAutoString tagString; - if (nsnull != mContent) { - nsIAtom* tag; - mContent->GetTag(tag); - if (tag != nsnull) { - tag->ToString(tagString); - NS_RELEASE(tag); - } - } - - // Indent IndentBy(out, aIndent); - - // Output the tag and rect ListTag(out); if (nsnull != mView) { fprintf(out, " [view=%p]", mView); } - fputs(" ", out); - out << mRect; + fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height); if (0 != mState) { fprintf(out, " [state=%08x]", mState); }