author | Timothy Nikkel <tnikkel@gmail.com> |
Fri, 25 Jun 2010 16:51:17 -0500 | |
changeset 46249 | eadd460405a2c3b6106603396d270ea3af4d2bbc |
parent 46248 | 94ffc25de87667c67119d47d12186515ff9376ea |
child 46250 | 99f7e3994a54db21f0fb7d72de05a089b5e17894 |
push id | 1 |
push user | root |
push date | Tue, 26 Apr 2011 22:38:44 +0000 |
treeherder | mozilla-beta@bfdb6e623a36 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | dbaron |
bugs | 574756 |
milestone | 1.9.3a6pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -4173,16 +4173,17 @@ nsFrame::List(FILE* out, PRInt32 aIndent } fprintf(out, " [content=%p]", static_cast<void*>(mContent)); nsFrame* f = const_cast<nsFrame*>(this); if (f->HasOverflowRect()) { nsRect overflowArea = f->GetOverflowRect(); fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea.x, overflowArea.y, overflowArea.width, overflowArea.height); } + fprintf(out, " [sc=%p]", static_cast<void*>(mStyleContext)); fputs("\n", out); return NS_OK; } NS_IMETHODIMP nsFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Frame"), aResult);
--- a/layout/generic/nsImageFrame.cpp +++ b/layout/generic/nsImageFrame.cpp @@ -1584,22 +1584,22 @@ nsImageFrame::List(FILE* out, PRInt32 aI IndentBy(out, aIndent); ListTag(out); #ifdef DEBUG_waterson 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); + fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height); if (0 != mState) { fprintf(out, " [state=%016llx]", mState); } fprintf(out, " [content=%p]", (void*)mContent); + fprintf(out, " [sc=%p]", static_cast<void*>(mStyleContext)); // output the img src url nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(mContent); if (imageLoader) { nsCOMPtr<imgIRequest> currentRequest; imageLoader->GetRequest(nsIImageLoadingContent::CURRENT_REQUEST, getter_AddRefs(currentRequest)); if (currentRequest) {
--- a/layout/generic/nsPlaceholderFrame.cpp +++ b/layout/generic/nsPlaceholderFrame.cpp @@ -272,16 +272,19 @@ nsPlaceholderFrame::List(FILE* out, PRIn fprintf(out, " prev-in-flow=%p", static_cast<void*>(prevInFlow)); } if (nsnull != nextInFlow) { fprintf(out, " next-in-flow=%p", static_cast<void*>(nextInFlow)); } if (nsnull != mContent) { fprintf(out, " [content=%p]", static_cast<void*>(mContent)); } + if (nsnull != mStyleContext) { + fprintf(out, " [sc=%p]", static_cast<void*>(mStyleContext)); + } if (mOutOfFlowFrame) { fprintf(out, " outOfFlowFrame="); nsFrame::ListTag(out, mOutOfFlowFrame); } fputs("\n", out); return NS_OK; } #endif