зеркало из https://github.com/mozilla/gecko-dev.git
Bug 571059: Update debugging printfs to treat nsFrameState objects as 64-bit & fix build warnings. r=dbaron
This commit is contained in:
Родитель
7e95b0dd5c
Коммит
f0ce4494a7
|
@ -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()) {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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++;
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче