author | Daniel Holbert <dholbert@cs.stanford.edu> |
Thu, 10 Jun 2010 11:26:57 -0700 | |
changeset 43479 | 792cd3e8aa59b24c333f2c90f938beda361b3336 |
parent 43478 | 2b619f9ca0bdcc0629461236fc09df0d54a33f8e |
child 43480 | 35b389db8369530989b1003552515c4516503ced |
push id | 13728 |
push user | dholbert@mozilla.com |
push date | Thu, 10 Jun 2010 18:27:12 +0000 |
treeherder | mozilla-central@792cd3e8aa59 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | dbaron |
bugs | 571059 |
milestone | 1.9.3a6pre |
first release with | nightly win64
792cd3e8aa59
/
3.7a6pre
/
20100610144513
/
files
nightly linux32
nightly linux64
nightly mac
nightly win32
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
releases | nightly win64
3.7a6pre
/
20100610144513
/
pushlog to previous
|
--- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -393,17 +393,17 @@ nsBlockFrame::List(FILE* out, PRInt32 aI if (nsnull != mContent) { fprintf(out, " [content=%p]", static_cast<void*>(mContent)); } // 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()) { nsRect overflowArea = f->GetOverflowRect(); fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea.x, overflowArea.y, overflowArea.width, overflowArea.height); } PRInt32 numInlineLines = 0;
--- a/layout/generic/nsContainerFrame.cpp +++ b/layout/generic/nsContainerFrame.cpp @@ -1536,17 +1536,17 @@ nsContainerFrame::List(FILE* out, PRInt3 fprintf(out, " IBSplitSpecialSibling=%p", IBsibling); } void* IBprevsibling = Properties().Get(IBSplitSpecialPrevSibling()); if (IBprevsibling) { fprintf(out, " IBSplitSpecialPrevSibling=%p", IBprevsibling); } 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); if (f->HasOverflowRect()) { nsRect overflowArea = f->GetOverflowRect(); fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea.x, overflowArea.y, overflowArea.width, overflowArea.height); }
--- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -4136,17 +4136,17 @@ nsFrame::List(FILE* out, PRInt32 aIndent #ifdef DEBUG_waterson fprintf(out, " [parent=%p]", static_cast<void*>(mParent)); #endif if (HasView()) { fprintf(out, " [view=%p]", static_cast<void*>(GetView())); } 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(); if (nsnull != prevInFlow) { fprintf(out, " prev-in-flow=%p", static_cast<void*>(prevInFlow)); } if (nsnull != nextInFlow) { fprintf(out, " next-in-flow=%p", static_cast<void*>(nextInFlow)); @@ -4352,17 +4352,17 @@ NS_IMETHODIMP nsFrame::DumpRegressionData(nsPresContext* aPresContext, FILE* out, PRInt32 aIndent) { IndentBy(out, aIndent); fprintf(out, "<frame va=\"%ld\" type=\"", PRUptrdiff(this)); nsAutoString name; 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++; DumpBaseRegressionData(aPresContext, out, aIndent); aIndent--; IndentBy(out, aIndent); fprintf(out, "</frame>\n");
--- a/layout/generic/nsImageFrame.cpp +++ b/layout/generic/nsImageFrame.cpp @@ -1587,17 +1587,17 @@ nsImageFrame::List(FILE* out, PRInt32 aI fprintf(out, " [parent=%p]", mParent); #endif if (HasView()) { fprintf(out, " [view=%p]", (void*)GetView()); } 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); // output the img src url nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(mContent); if (imageLoader) { nsCOMPtr<imgIRequest> currentRequest; imageLoader->GetRequest(nsIImageLoadingContent::CURRENT_REQUEST,
--- a/layout/generic/nsPlaceholderFrame.cpp +++ b/layout/generic/nsPlaceholderFrame.cpp @@ -235,17 +235,17 @@ nsPlaceholderFrame::List(FILE* out, PRIn #ifdef DEBUG_waterson fprintf(out, " [parent=%p]", static_cast<void*>(mParent)); #endif if (HasView()) { fprintf(out, " [view=%p]", (void*)GetView()); } 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(); if (nsnull != prevInFlow) { fprintf(out, " prev-in-flow=%p", static_cast<void*>(prevInFlow)); } if (nsnull != nextInFlow) { fprintf(out, " next-in-flow=%p", static_cast<void*>(nextInFlow));
--- a/layout/generic/nsTextFrameThebes.cpp +++ b/layout/generic/nsTextFrameThebes.cpp @@ -6931,19 +6931,19 @@ nsTextFrame::List(FILE* out, PRInt32 aIn if (nsnull != mNextContinuation) { fprintf(out, " next-continuation=%p", static_cast<void*>(mNextContinuation)); } // Output the rect and state 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)); if (HasOverflowRect()) { nsRect overflowArea = GetOverflowRect(); fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea.x, overflowArea.y, overflowArea.width, overflowArea.height); }
--- a/layout/xul/base/src/nsPopupSetFrame.cpp +++ b/layout/xul/base/src/nsPopupSetFrame.cpp @@ -202,17 +202,17 @@ nsPopupSetFrame::List(FILE* out, PRInt32 if (nsnull != GetPrevContinuation()) { fprintf(out, " prev-continuation=%p", static_cast<void*>(GetPrevContinuation())); } if (nsnull != GetNextContinuation()) { fprintf(out, " next-continuation=%p", static_cast<void*>(GetNextContinuation())); } 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); if (f->HasOverflowRect()) { nsRect overflowArea = f->GetOverflowRect(); fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea.x, overflowArea.y, overflowArea.width, overflowArea.height); }