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
parent 7e95b0dd5c
commit f0ce4494a7
7 changed files with 9 additions and 9 deletions

View File

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

View File

@ -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);
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
fprintf(out, " [state=%016llx]", mState);
}
fprintf(out, " [content=%p]", static_cast<void*>(mContent));
nsContainerFrame* f = const_cast<nsContainerFrame*>(this);

View File

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

View File

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

View File

@ -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);
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
fprintf(out, " [state=%016llx]", mState);
}
nsIFrame* prevInFlow = GetPrevInFlow();
nsIFrame* nextInFlow = GetNextInFlow();

View File

@ -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);
if (0 != mState) {
if (mState & NS_FRAME_SELECTED_CONTENT) {
fprintf(out, " [state=%08x] SELECTED", mState);
fprintf(out, " [state=%016llx] SELECTED", mState);
} else {
fprintf(out, " [state=%08x]", mState);
fprintf(out, " [state=%016llx]", mState);
}
}
fprintf(out, " [content=%p]", static_cast<void*>(mContent));

View File

@ -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);
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
fprintf(out, " [state=%016llx]", mState);
}
fprintf(out, " [content=%p]", static_cast<void*>(mContent));
nsPopupSetFrame* f = const_cast<nsPopupSetFrame*>(this);