From 38fb3310d65f7930277117c98c78d39bbfdf9459 Mon Sep 17 00:00:00 2001
From: "kipp%netscape.com"
 <kipp%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 19 Nov 1998 18:51:53 +0000
Subject: [PATCH] Improved the regression dump data somewhat

git-svn-id: svn://10.0.0.236/trunk@14953 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsFrame.cpp                 |  5 +++--
 mozilla/layout/generic/nsSplittableFrame.cpp       | 14 ++++++++++++++
 mozilla/layout/generic/nsSplittableFrame.h         |  2 ++
 mozilla/layout/html/base/src/nsFrame.cpp           |  5 +++--
 mozilla/layout/html/base/src/nsSplittableFrame.cpp | 14 ++++++++++++++
 mozilla/layout/html/base/src/nsSplittableFrame.h   |  2 ++
 6 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp
index 60cb7231e8e..08b5a23a335 100644
--- a/mozilla/layout/generic/nsFrame.cpp
+++ b/mozilla/layout/generic/nsFrame.cpp
@@ -1567,19 +1567,20 @@ nsresult
 nsFrame::MakeFrameName(const char* aType, nsString& aResult) const
 {
   aResult = aType;
-  aResult.Append("(");
   if (nsnull != mContent) {
     nsIAtom* tag;
     mContent->GetTag(tag);
     if (tag != nsnull) {
+      aResult.Append("(");
       nsAutoString buf;
       tag->ToString(buf);
       aResult.Append(buf);
       NS_RELEASE(tag);
+      aResult.Append(")");
     }
   }
   char buf[40];
-  PR_snprintf(buf, sizeof(buf), ")(%d)", ContentIndexInContainer(this));
+  PR_snprintf(buf, sizeof(buf), "(%d)", ContentIndexInContainer(this));
   aResult.Append(buf);
   return NS_OK;
 }
diff --git a/mozilla/layout/generic/nsSplittableFrame.cpp b/mozilla/layout/generic/nsSplittableFrame.cpp
index 2a004b5bab5..5e9dc99b397 100644
--- a/mozilla/layout/generic/nsSplittableFrame.cpp
+++ b/mozilla/layout/generic/nsSplittableFrame.cpp
@@ -180,3 +180,17 @@ nsIFrame * nsSplittableFrame::GetNextInFlow()
 {
    return mNextInFlow;
 } 
+
+void
+nsSplittableFrame::DumpBaseRegressionData(FILE* out, PRInt32 aIndent)
+{
+  nsFrame::DumpBaseRegressionData(out, aIndent);
+  if (nsnull != mNextInFlow) {
+    IndentBy(out, aIndent);
+    fprintf(out, "<next-in-flow addr=\"%p\"/>\n", mNextInFlow);
+  }
+  if (nsnull != mPrevInFlow) {
+    IndentBy(out, aIndent);
+    fprintf(out, "<prev-in-flow addr=\"%p\"/>\n", mPrevInFlow);
+  }
+}
diff --git a/mozilla/layout/generic/nsSplittableFrame.h b/mozilla/layout/generic/nsSplittableFrame.h
index ce9e9f5cd75..c43d8e25a01 100644
--- a/mozilla/layout/generic/nsSplittableFrame.h
+++ b/mozilla/layout/generic/nsSplittableFrame.h
@@ -64,6 +64,8 @@ protected:
 
   void SizeOfWithoutThis(nsISizeOfHandler* aHandler) const;
 
+  virtual void DumpBaseRegressionData(FILE* out, PRInt32 aIndent);
+
   nsIFrame*   mPrevInFlow;
   nsIFrame*   mNextInFlow;
 };
diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp
index 60cb7231e8e..08b5a23a335 100644
--- a/mozilla/layout/html/base/src/nsFrame.cpp
+++ b/mozilla/layout/html/base/src/nsFrame.cpp
@@ -1567,19 +1567,20 @@ nsresult
 nsFrame::MakeFrameName(const char* aType, nsString& aResult) const
 {
   aResult = aType;
-  aResult.Append("(");
   if (nsnull != mContent) {
     nsIAtom* tag;
     mContent->GetTag(tag);
     if (tag != nsnull) {
+      aResult.Append("(");
       nsAutoString buf;
       tag->ToString(buf);
       aResult.Append(buf);
       NS_RELEASE(tag);
+      aResult.Append(")");
     }
   }
   char buf[40];
-  PR_snprintf(buf, sizeof(buf), ")(%d)", ContentIndexInContainer(this));
+  PR_snprintf(buf, sizeof(buf), "(%d)", ContentIndexInContainer(this));
   aResult.Append(buf);
   return NS_OK;
 }
diff --git a/mozilla/layout/html/base/src/nsSplittableFrame.cpp b/mozilla/layout/html/base/src/nsSplittableFrame.cpp
index 2a004b5bab5..5e9dc99b397 100644
--- a/mozilla/layout/html/base/src/nsSplittableFrame.cpp
+++ b/mozilla/layout/html/base/src/nsSplittableFrame.cpp
@@ -180,3 +180,17 @@ nsIFrame * nsSplittableFrame::GetNextInFlow()
 {
    return mNextInFlow;
 } 
+
+void
+nsSplittableFrame::DumpBaseRegressionData(FILE* out, PRInt32 aIndent)
+{
+  nsFrame::DumpBaseRegressionData(out, aIndent);
+  if (nsnull != mNextInFlow) {
+    IndentBy(out, aIndent);
+    fprintf(out, "<next-in-flow addr=\"%p\"/>\n", mNextInFlow);
+  }
+  if (nsnull != mPrevInFlow) {
+    IndentBy(out, aIndent);
+    fprintf(out, "<prev-in-flow addr=\"%p\"/>\n", mPrevInFlow);
+  }
+}
diff --git a/mozilla/layout/html/base/src/nsSplittableFrame.h b/mozilla/layout/html/base/src/nsSplittableFrame.h
index ce9e9f5cd75..c43d8e25a01 100644
--- a/mozilla/layout/html/base/src/nsSplittableFrame.h
+++ b/mozilla/layout/html/base/src/nsSplittableFrame.h
@@ -64,6 +64,8 @@ protected:
 
   void SizeOfWithoutThis(nsISizeOfHandler* aHandler) const;
 
+  virtual void DumpBaseRegressionData(FILE* out, PRInt32 aIndent);
+
   nsIFrame*   mPrevInFlow;
   nsIFrame*   mNextInFlow;
 };