mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update List implementations to use GetAdditionalChildLists so that all lists of children are dumped out automatically

This commit is contained in:
kipp%netscape.com 1999-01-16 00:19:10 +00:00
Родитель 06d2d8efb3
Коммит d95b57f509
8 изменённых файлов: 366 добавлений и 148 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

71
layout/generic/nsBlockFrame.cpp
Просмотреть файл

@ -553,7 +553,33 @@ nsBaseIBFrame::List(FILE* out, PRInt32 aIndent) const
}
}
// Output the text-runs
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
for (;;) {
nsIFrame* kid;
GetAdditionalChildListName(listIndex++, listName);
if (nsnull == listName) {
break;
}
FirstChild(listName, kid);
if (nsnull != kid) {
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
}
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
@ -4339,15 +4365,6 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out);
aIndent++;
// Output bullet first
if (nsnull != mBullet) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
mBullet->List(out, aIndent+1);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
@ -4357,17 +4374,31 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
}
}
// Output floaters next
if (mFloaters.NotEmpty()) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
nsIFrame* floater = mFloaters.FirstChild();
while (nsnull != floater) {
floater->List(out, aIndent+1);
floater->GetNextSibling(floater);
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
for (;;) {
nsIFrame* kid;
GetAdditionalChildListName(listIndex++, listName);
if (nsnull == listName) {
break;
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
FirstChild(listName, kid);
if (nsnull != kid) {
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
}
// Output the text-runs

71
layout/generic/nsBlockReflowState.cpp
Просмотреть файл

@ -553,7 +553,33 @@ nsBaseIBFrame::List(FILE* out, PRInt32 aIndent) const
}
}
// Output the text-runs
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
for (;;) {
nsIFrame* kid;
GetAdditionalChildListName(listIndex++, listName);
if (nsnull == listName) {
break;
}
FirstChild(listName, kid);
if (nsnull != kid) {
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
}
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
@ -4339,15 +4365,6 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out);
aIndent++;
// Output bullet first
if (nsnull != mBullet) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
mBullet->List(out, aIndent+1);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
@ -4357,17 +4374,31 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
}
}
// Output floaters next
if (mFloaters.NotEmpty()) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
nsIFrame* floater = mFloaters.FirstChild();
while (nsnull != floater) {
floater->List(out, aIndent+1);
floater->GetNextSibling(floater);
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
for (;;) {
nsIFrame* kid;
GetAdditionalChildListName(listIndex++, listName);
if (nsnull == listName) {
break;
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
FirstChild(listName, kid);
if (nsnull != kid) {
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
}
// Output the text-runs

71
layout/generic/nsBlockReflowState.h
Просмотреть файл

@ -553,7 +553,33 @@ nsBaseIBFrame::List(FILE* out, PRInt32 aIndent) const
}
}
// Output the text-runs
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
for (;;) {
nsIFrame* kid;
GetAdditionalChildListName(listIndex++, listName);
if (nsnull == listName) {
break;
}
FirstChild(listName, kid);
if (nsnull != kid) {
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
}
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
@ -4339,15 +4365,6 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out);
aIndent++;
// Output bullet first
if (nsnull != mBullet) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
mBullet->List(out, aIndent+1);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
@ -4357,17 +4374,31 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
}
}
// Output floaters next
if (mFloaters.NotEmpty()) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
nsIFrame* floater = mFloaters.FirstChild();
while (nsnull != floater) {
floater->List(out, aIndent+1);
floater->GetNextSibling(floater);
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
for (;;) {
nsIFrame* kid;
GetAdditionalChildListName(listIndex++, listName);
if (nsnull == listName) {
break;
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
FirstChild(listName, kid);
if (nsnull != kid) {
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
}
// Output the text-runs

44
layout/generic/nsContainerFrame.cpp
Просмотреть файл

@ -592,22 +592,38 @@ nsContainerFrame::List(FILE* out, PRInt32 aIndent) const
// Output the rect
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
// Output the children
if (mFrames.NotEmpty()) {
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
for (nsIFrame* child = mFrames.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1);
}
IndentBy(out, aIndent);
fputs(">\n", out);
} else {
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
PRBool outputOneList = PR_FALSE;
do {
nsIFrame* kid;
FirstChild(listName, kid);
if (nsnull != kid) {
outputOneList = PR_TRUE;
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
GetAdditionalChildListName(listIndex++, listName);
} while(nsnull != listName);
if (!outputOneList) {
fputs("<>\n", out);
}

71
layout/html/base/src/nsBlockFrame.cpp
Просмотреть файл

@ -553,7 +553,33 @@ nsBaseIBFrame::List(FILE* out, PRInt32 aIndent) const
}
}
// Output the text-runs
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
for (;;) {
nsIFrame* kid;
GetAdditionalChildListName(listIndex++, listName);
if (nsnull == listName) {
break;
}
FirstChild(listName, kid);
if (nsnull != kid) {
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
}
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
@ -4339,15 +4365,6 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out);
aIndent++;
// Output bullet first
if (nsnull != mBullet) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
mBullet->List(out, aIndent+1);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
@ -4357,17 +4374,31 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
}
}
// Output floaters next
if (mFloaters.NotEmpty()) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
nsIFrame* floater = mFloaters.FirstChild();
while (nsnull != floater) {
floater->List(out, aIndent+1);
floater->GetNextSibling(floater);
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
for (;;) {
nsIFrame* kid;
GetAdditionalChildListName(listIndex++, listName);
if (nsnull == listName) {
break;
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
FirstChild(listName, kid);
if (nsnull != kid) {
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
}
// Output the text-runs

71
layout/html/base/src/nsBlockReflowState.cpp
Просмотреть файл

@ -553,7 +553,33 @@ nsBaseIBFrame::List(FILE* out, PRInt32 aIndent) const
}
}
// Output the text-runs
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
for (;;) {
nsIFrame* kid;
GetAdditionalChildListName(listIndex++, listName);
if (nsnull == listName) {
break;
}
FirstChild(listName, kid);
if (nsnull != kid) {
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
}
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
@ -4339,15 +4365,6 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out);
aIndent++;
// Output bullet first
if (nsnull != mBullet) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
mBullet->List(out, aIndent+1);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
@ -4357,17 +4374,31 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
}
}
// Output floaters next
if (mFloaters.NotEmpty()) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
nsIFrame* floater = mFloaters.FirstChild();
while (nsnull != floater) {
floater->List(out, aIndent+1);
floater->GetNextSibling(floater);
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
for (;;) {
nsIFrame* kid;
GetAdditionalChildListName(listIndex++, listName);
if (nsnull == listName) {
break;
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
FirstChild(listName, kid);
if (nsnull != kid) {
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
}
// Output the text-runs

71
layout/html/base/src/nsBlockReflowState.h
Просмотреть файл

@ -553,7 +553,33 @@ nsBaseIBFrame::List(FILE* out, PRInt32 aIndent) const
}
}
// Output the text-runs
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
for (;;) {
nsIFrame* kid;
GetAdditionalChildListName(listIndex++, listName);
if (nsnull == listName) {
break;
}
FirstChild(listName, kid);
if (nsnull != kid) {
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
}
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
@ -4339,15 +4365,6 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out);
aIndent++;
// Output bullet first
if (nsnull != mBullet) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
mBullet->List(out, aIndent+1);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
@ -4357,17 +4374,31 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
}
}
// Output floaters next
if (mFloaters.NotEmpty()) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
nsIFrame* floater = mFloaters.FirstChild();
while (nsnull != floater) {
floater->List(out, aIndent+1);
floater->GetNextSibling(floater);
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
for (;;) {
nsIFrame* kid;
GetAdditionalChildListName(listIndex++, listName);
if (nsnull == listName) {
break;
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
FirstChild(listName, kid);
if (nsnull != kid) {
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
}
// Output the text-runs

44
layout/html/base/src/nsContainerFrame.cpp
Просмотреть файл

@ -592,22 +592,38 @@ nsContainerFrame::List(FILE* out, PRInt32 aIndent) const
// Output the rect
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
// Output the children
if (mFrames.NotEmpty()) {
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
for (nsIFrame* child = mFrames.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1);
}
IndentBy(out, aIndent);
fputs(">\n", out);
} else {
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
PRBool outputOneList = PR_FALSE;
do {
nsIFrame* kid;
FirstChild(listName, kid);
if (nsnull != kid) {
outputOneList = PR_TRUE;
IndentBy(out, aIndent);
nsAutoString tmp;
if (nsnull != listName) {
listName->ToString(tmp);
fputs(tmp, out);
}
fputs("<\n", out);
while (nsnull != kid) {
kid->List(out, aIndent + 1);
kid->GetNextSibling(kid);
}
IndentBy(out, aIndent);
fputs(">\n", out);
}
NS_IF_RELEASE(listName);
GetAdditionalChildListName(listIndex++, listName);
} while(nsnull != listName);
if (!outputOneList) {
fputs("<>\n", out);
}