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

Bug 571059: Update debugging printfs to treat nsFrameState objects as 64-bit & fix build warnings. r=dbaron

This commit is contained in:
Daniel Holbert 2010-06-10 11:26:57 -07:00
Родитель 7e95b0dd5c
Коммит f0ce4494a7
7 изменённых файлов: 9 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -398,7 +398,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
// Output the rect and state // Output the rect and state
fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height); fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height);
if (0 != mState) { if (0 != mState) {
fprintf(out, " [state=%08x]", mState); fprintf(out, " [state=%016llx]", mState);
} }
nsBlockFrame* f = const_cast<nsBlockFrame*>(this); nsBlockFrame* f = const_cast<nsBlockFrame*>(this);
if (f->HasOverflowRect()) { if (f->HasOverflowRect()) {

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

@ -1541,7 +1541,7 @@ nsContainerFrame::List(FILE* out, PRInt32 aIndent) const
} }
fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height); fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height);
if (0 != mState) { if (0 != mState) {
fprintf(out, " [state=%08x]", mState); fprintf(out, " [state=%016llx]", mState);
} }
fprintf(out, " [content=%p]", static_cast<void*>(mContent)); fprintf(out, " [content=%p]", static_cast<void*>(mContent));
nsContainerFrame* f = const_cast<nsContainerFrame*>(this); nsContainerFrame* f = const_cast<nsContainerFrame*>(this);

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

@ -4141,7 +4141,7 @@ nsFrame::List(FILE* out, PRInt32 aIndent) const
} }
fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height); fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height);
if (0 != mState) { if (0 != mState) {
fprintf(out, " [state=%08x]", mState); fprintf(out, " [state=%016llx]", mState);
} }
nsIFrame* prevInFlow = GetPrevInFlow(); nsIFrame* prevInFlow = GetPrevInFlow();
nsIFrame* nextInFlow = GetNextInFlow(); nsIFrame* nextInFlow = GetNextInFlow();
@ -4357,7 +4357,7 @@ nsFrame::DumpRegressionData(nsPresContext* aPresContext, FILE* out, PRInt32 aInd
GetFrameName(name); GetFrameName(name);
XMLQuote(name); XMLQuote(name);
fputs(NS_LossyConvertUTF16toASCII(name).get(), out); fputs(NS_LossyConvertUTF16toASCII(name).get(), out);
fprintf(out, "\" state=\"%d\" parent=\"%ld\">\n", fprintf(out, "\" state=\"%016llx\" parent=\"%ld\">\n",
GetDebugStateBits(), PRUptrdiff(mParent)); GetDebugStateBits(), PRUptrdiff(mParent));
aIndent++; aIndent++;

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

@ -1592,7 +1592,7 @@ nsImageFrame::List(FILE* out, PRInt32 aIndent) const
fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width,
mRect.height); mRect.height);
if (0 != mState) { if (0 != mState) {
fprintf(out, " [state=%08x]", mState); fprintf(out, " [state=%016llx]", mState);
} }
fprintf(out, " [content=%p]", (void*)mContent); fprintf(out, " [content=%p]", (void*)mContent);

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

@ -240,7 +240,7 @@ nsPlaceholderFrame::List(FILE* out, PRInt32 aIndent) const
} }
fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height); fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height);
if (0 != mState) { if (0 != mState) {
fprintf(out, " [state=%08x]", mState); fprintf(out, " [state=%016llx]", mState);
} }
nsIFrame* prevInFlow = GetPrevInFlow(); nsIFrame* prevInFlow = GetPrevInFlow();
nsIFrame* nextInFlow = GetNextInFlow(); nsIFrame* nextInFlow = GetNextInFlow();

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

@ -6936,9 +6936,9 @@ nsTextFrame::List(FILE* out, PRInt32 aIndent) const
fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height); fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height);
if (0 != mState) { if (0 != mState) {
if (mState & NS_FRAME_SELECTED_CONTENT) { if (mState & NS_FRAME_SELECTED_CONTENT) {
fprintf(out, " [state=%08x] SELECTED", mState); fprintf(out, " [state=%016llx] SELECTED", mState);
} else { } else {
fprintf(out, " [state=%08x]", mState); fprintf(out, " [state=%016llx]", mState);
} }
} }
fprintf(out, " [content=%p]", static_cast<void*>(mContent)); fprintf(out, " [content=%p]", static_cast<void*>(mContent));

2
layout/xul/base/src/nsPopupSetFrame.cpp
Просмотреть файл

@ -207,7 +207,7 @@ nsPopupSetFrame::List(FILE* out, PRInt32 aIndent) const
} }
fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height); fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height);
if (0 != mState) { if (0 != mState) {
fprintf(out, " [state=%08x]", mState); fprintf(out, " [state=%016llx]", mState);
} }
fprintf(out, " [content=%p]", static_cast<void*>(mContent)); fprintf(out, " [content=%p]", static_cast<void*>(mContent));
nsPopupSetFrame* f = const_cast<nsPopupSetFrame*>(this); nsPopupSetFrame* f = const_cast<nsPopupSetFrame*>(this);