From 305e652840b3dcee18e3c668521543a7da098490 Mon Sep 17 00:00:00 2001 From: Ting-Yu Lin Date: Tue, 29 Jan 2019 21:22:14 +0000 Subject: [PATCH] Bug 1523061 Part 2 - Remove static ListTag(FILE*, const nsIFrame*). r=dholbert Many of the modifications are guarded by #ifdefs. I verify them locally by manually define them in nsBlockDebugFlags.h and nsLinelayout.cpp. Note that I replace "mFrame" with "frame" in lines guarded by NOISY_BLOCK_DIR_MARGINS in nsBlockFrame.cpp because they were incorrectly renamed in Bug 1277129 Part 6a. https://hg.mozilla.org/mozilla-central/rev/a70b04f074fc Differential Revision: https://phabricator.services.mozilla.com/D17733 --HG-- extra : moz-landing-system : lando --- layout/base/nsCSSFrameConstructor.cpp | 14 +++---- layout/generic/BlockReflowInput.cpp | 8 ++-- layout/generic/nsBlockFrame.cpp | 22 +++++----- layout/generic/nsBlockReflowContext.cpp | 16 ++++---- layout/generic/nsFrame.cpp | 2 +- layout/generic/nsIFrame.h | 7 +--- layout/generic/nsLineLayout.cpp | 54 ++++++++++++------------- 7 files changed, 60 insertions(+), 63 deletions(-) diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 4735fa629893..e75ab55bb178 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -6712,7 +6712,7 @@ void nsCSSFrameConstructor::ContentAppended(nsIContent* aFirstNewContent, #ifdef DEBUG if (gNoisyContentUpdates && IsFramePartOfIBSplit(parentFrame)) { printf("nsCSSFrameConstructor::ContentAppended: parentFrame="); - nsFrame::ListTag(stdout, parentFrame); + parentFrame->ListTag(stdout); printf(" is ib-split\n"); } #endif @@ -7572,11 +7572,11 @@ bool nsCSSFrameConstructor::ContentRemoved(nsIContent* aChild, // frame tree when first-letter style is present. #ifdef NOISY_FIRST_LETTER printf("ContentRemoved: containingBlock="); - nsFrame::ListTag(stdout, containingBlock); + containingBlock->ListTag(stdout); printf(" parentFrame="); - nsFrame::ListTag(stdout, parentFrame); + parentFrame->ListTag(stdout); printf(" childFrame="); - nsFrame::ListTag(stdout, childFrame); + childFrame->ListTag(stdout); printf("\n"); #endif @@ -7597,9 +7597,9 @@ bool nsCSSFrameConstructor::ContentRemoved(nsIContent* aChild, #ifdef NOISY_FIRST_LETTER printf(" ==> revised parentFrame="); - nsFrame::ListTag(stdout, parentFrame); + parentFrame->ListTag(stdout); printf(" childFrame="); - nsFrame::ListTag(stdout, childFrame); + childFrame->ListTag(stdout); printf("\n"); #endif } @@ -7607,7 +7607,7 @@ bool nsCSSFrameConstructor::ContentRemoved(nsIContent* aChild, #ifdef DEBUG if (gReallyNoisyContentUpdates) { printf("nsCSSFrameConstructor::ContentRemoved: childFrame="); - nsFrame::ListTag(stdout, childFrame); + childFrame->ListTag(stdout); putchar('\n'); parentFrame->List(stdout); } diff --git a/layout/generic/BlockReflowInput.cpp b/layout/generic/BlockReflowInput.cpp index 23e6f35e7820..b51adf955d0b 100644 --- a/layout/generic/BlockReflowInput.cpp +++ b/layout/generic/BlockReflowInput.cpp @@ -471,7 +471,7 @@ void BlockReflowInput::RecoverFloats(nsLineList::iterator aLine, nsFrame::IndentBy(stdout, nsBlockFrame::gNoiseIndent); printf("RecoverFloats: tIB=%d,%d (%d,%d) ", tI, tB, mFloatManagerI, mFloatManagerB); - nsFrame::ListTag(stdout, floatFrame); + floatFrame->ListTag(stdout); LogicalRect region = nsFloatManager::GetRegionFor(wm, floatFrame, ContainerSize()); printf(" aDeltaBCoord=%d region={%d,%d,%d,%d}\n", aDeltaBCoord, @@ -1023,7 +1023,7 @@ bool BlockReflowInput::FlowAndPlaceFloat(nsIFrame* aFloat) { if (nsBlockFrame::gNoisyFloatManager) { nscoord tI, tB; FloatManager()->GetTranslation(tI, tB); - nsIFrame::ListTag(stdout, mBlock); + mBlock->ListTag(stdout); printf(": FlowAndPlaceFloat: AddFloat: tIB=%d,%d (%d,%d) {%d,%d,%d,%d}\n", tI, tB, mFloatManagerI, mFloatManagerB, region.IStart(wm), region.BStart(wm), region.ISize(wm), region.BSize(wm)); @@ -1033,7 +1033,7 @@ bool BlockReflowInput::FlowAndPlaceFloat(nsIFrame* aFloat) { nsRect r = aFloat->GetRect(); nsFrame::IndentBy(stdout, nsBlockFrame::gNoiseIndent); printf("placed float: "); - nsFrame::ListTag(stdout, aFloat); + aFloat->ListTag(stdout); printf(" %d,%d,%d,%d\n", r.x, r.y, r.width, r.height); } #endif @@ -1074,7 +1074,7 @@ void BlockReflowInput::PlaceBelowCurrentLineFloats(nsLineBox* aLine) { if (nsBlockFrame::gNoisyReflow) { nsFrame::IndentBy(stdout, nsBlockFrame::gNoiseIndent); printf("placing bcl float: "); - nsFrame::ListTag(stdout, fc->mFloat); + fc->mFloat->ListTag(stdout); printf("\n"); } #endif diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index 1ea77c9dd374..31b77e9cf9a7 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -3645,7 +3645,7 @@ void nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState, #ifdef NOISY_BLOCK_DIR_MARGINS ListTag(stdout); printf(": reflow incomplete, frame="); - nsFrame::ListTag(stdout, mFrame); + frame->ListTag(stdout); printf(" prevBEndMargin=%d, setting to zero\n", aState.mPrevBEndMargin.get()); #endif @@ -3671,7 +3671,7 @@ void nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState, #ifdef NOISY_BLOCK_DIR_MARGINS ListTag(stdout); printf(": reflow complete but overflow incomplete for "); - nsFrame::ListTag(stdout, mFrame); + frame->ListTag(stdout); printf(" prevBEndMargin=%d collapsedBEndMargin=%d\n", aState.mPrevBEndMargin.get(), collapsedBEndMargin.get()); #endif @@ -3681,7 +3681,7 @@ void nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState, #ifdef NOISY_BLOCK_DIR_MARGINS ListTag(stdout); printf(": reflow complete for "); - nsFrame::ListTag(stdout, mFrame); + frame->ListTag(stdout); printf(" prevBEndMargin=%d collapsedBEndMargin=%d\n", aState.mPrevBEndMargin.get(), collapsedBEndMargin.get()); #endif @@ -3690,7 +3690,7 @@ void nsBlockFrame::ReflowBlockFrame(BlockReflowInput& aState, #ifdef NOISY_BLOCK_DIR_MARGINS ListTag(stdout); printf(": frame="); - nsFrame::ListTag(stdout, mFrame); + frame->ListTag(stdout); printf(" carriedOutBEndMargin=%d collapsedBEndMargin=%d => %d\n", brc.GetCarriedOutBEndMargin().get(), collapsedBEndMargin.get(), aState.mPrevBEndMargin.get()); @@ -4068,7 +4068,7 @@ void nsBlockFrame::ReflowInlineFrame(BlockReflowInput& aState, #ifdef NOISY_FIRST_LETTER ListTag(stdout); printf(": reflowing "); - nsFrame::ListTag(stdout, aFrame); + aFrame->ListTag(stdout); printf(" reflowingFirstLetter=%s\n", aLineLayout.GetFirstLetterStyleOK() ? "on" : "off"); #endif @@ -4088,7 +4088,7 @@ void nsBlockFrame::ReflowInlineFrame(BlockReflowInput& aState, } #ifdef REALLY_NOISY_REFLOW - nsFrame::ListTag(stdout, aFrame); + aFrame->ListTag(stdout); printf(": status=%s\n", ToString(frameReflowStatus).c_str()); #endif @@ -4296,7 +4296,7 @@ void nsBlockFrame::SplitLine(BlockReflowInput& aState, printf("split line: from line=%p pushCount=%d aFrame=", static_cast(aLine.get()), pushCount); if (aFrame) { - nsFrame::ListTag(stdout, aFrame); + aFrame->ListTag(stdout); } else { printf("(null)"); } @@ -5073,7 +5073,7 @@ void nsBlockFrame::AppendFrames(ChildListID aListID, nsFrameList& aFrameList) { nsFrame::ListTag(stdout, aFrameList); if (lastKid) { printf(" after "); - nsFrame::ListTag(stdout, lastKid); + lastKid->ListTag(stdout); } printf("\n"); #endif @@ -5114,7 +5114,7 @@ void nsBlockFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrame::ListTag(stdout, aFrameList); if (aPrevFrame) { printf(" after "); - nsFrame::ListTag(stdout, aPrevFrame); + aPrevFrame->ListTag(stdout); } printf("\n"); #endif @@ -5131,7 +5131,7 @@ void nsBlockFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) { #ifdef NOISY_REFLOW_REASON ListTag(stdout); printf(": remove "); - nsFrame::ListTag(stdout, aOldFrame); + aOldFrame->ListTag(stdout); printf("\n"); #endif @@ -5752,7 +5752,7 @@ void nsBlockFrame::DoRemoveFrameInternal(nsIFrame* aDeletedFrame, #ifdef NOISY_REMOVE_FRAME printf("DoRemoveFrame: %s line=%p frame=", searchingOverflowList ? "overflow" : "normal", line.get()); - nsFrame::ListTag(stdout, aDeletedFrame); + aDeletedFrame->ListTag(stdout); printf(" prevSibling=%p deletedNextContinuation=%p\n", aDeletedFrame->GetPrevSibling(), deletedNextContinuation); #endif diff --git a/layout/generic/nsBlockReflowContext.cpp b/layout/generic/nsBlockReflowContext.cpp index 94ebd1a0b946..fc5c454d37c8 100644 --- a/layout/generic/nsBlockReflowContext.cpp +++ b/layout/generic/nsBlockReflowContext.cpp @@ -64,7 +64,7 @@ bool nsBlockReflowContext::ComputeCollapsedBStartMargin( // caller. #ifdef NOISY_BLOCKDIR_MARGINS - nsFrame::ListTag(stdout, aRI.mFrame); + aRI.mFrame->ListTag(stdout); printf(": %d => %d\n", aRI.ComputedLogicalMargin().BStart(wm), aMargin->get()); #endif @@ -211,7 +211,7 @@ done: } #ifdef NOISY_BLOCKDIR_MARGINS - nsFrame::ListTag(stdout, aRI.mFrame); + aRI.mFrame->ListTag(stdout); printf(": => %d\n", aMargin->get()); #endif @@ -236,9 +236,9 @@ void nsBlockReflowContext::ReflowBlock( mBStartMargin = aPrevMargin; #ifdef NOISY_BLOCKDIR_MARGINS - nsFrame::ListTag(stdout, mOuterReflowInput.mFrame); + mOuterReflowInput.mFrame->ListTag(stdout); printf(": reflowing "); - nsFrame::ListTag(stdout, mFrame); + mFrame->ListTag(stdout); printf(" margin => %d, clearance => %d\n", mBStartMargin.get(), aClearance); #endif @@ -303,14 +303,14 @@ void nsBlockReflowContext::ReflowBlock( CRAZY_SIZE(mMetrics.BSize(mWritingMode))) && !mFrame->GetParent()->IsCrazySizeAssertSuppressed()) { printf("nsBlockReflowContext: "); - nsFrame::ListTag(stdout, mFrame); + mFrame->ListTag(stdout); printf(" metrics=%d,%d!\n", mMetrics.ISize(mWritingMode), mMetrics.BSize(mWritingMode)); } if ((mMetrics.ISize(mWritingMode) == nscoord(0xdeadbeef)) || (mMetrics.BSize(mWritingMode) == nscoord(0xdeadbeef))) { printf("nsBlockReflowContext: "); - nsFrame::ListTag(stdout, mFrame); + mFrame->ListTag(stdout); printf(" didn't set i/b %d,%d!\n", mMetrics.ISize(mWritingMode), mMetrics.BSize(mWritingMode)); } @@ -382,9 +382,9 @@ bool nsBlockReflowContext::PlaceBlock(const ReflowInput& aReflowInput, #ifdef NOISY_BLOCKDIR_MARGINS printf(" "); - nsFrame::ListTag(stdout, mOuterReflowInput.mFrame); + mOuterReflowInput.mFrame->ListTag(stdout); printf(": "); - nsFrame::ListTag(stdout, mFrame); + mFrame->ListTag(stdout); printf( " -- collapsing block start & end margin together; BStart=%d " "spaceBStart=%d\n", diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index b7ba041b770f..0cdf92a516aa 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -9957,7 +9957,7 @@ void nsFrame::BoxReflow(nsBoxLayoutState& aState, nsPresContext* aPresContext, #ifdef DEBUG_REFLOW nsAdaptorAddIndents(); printf("Reflowing: "); - nsFrame::ListTag(stdout, mFrame); + mFrame->ListTag(stdout); printf("\n"); gIndent2++; #endif diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index 841eb1b38927..05894f1e3b59 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -4528,13 +4528,10 @@ class nsIFrame : public nsQueryFrame { static void IndentBy(FILE* out, int32_t aIndent) { while (--aIndent >= 0) fputs(" ", out); } - void ListTag(FILE* out) const { ListTag(out, this); } - static void ListTag(FILE* out, const nsIFrame* aFrame) { - fputs(aFrame->ListTag().get(), out); - } + void ListTag(FILE* out) const { fputs(ListTag().get(), out); } static void ListTag(FILE* out, const nsFrameList& aFrameList) { for (nsIFrame* frame : aFrameList) { - ListTag(out, frame); + frame->ListTag(out); } } nsAutoCString ListTag() const; diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp index 5c74679c73cb..5095eff4cdf2 100644 --- a/layout/generic/nsLineLayout.cpp +++ b/layout/generic/nsLineLayout.cpp @@ -156,17 +156,17 @@ void nsLineLayout::BeginLineReflow(nscoord aICoord, nscoord aBCoord, #ifdef DEBUG if ((aISize != NS_UNCONSTRAINEDSIZE) && CRAZY_SIZE(aISize) && !LineContainerFrame()->GetParent()->IsCrazySizeAssertSuppressed()) { - nsFrame::ListTag(stdout, mBlockReflowInput->mFrame); + mBlockReflowInput->mFrame->ListTag(stdout); printf(": Init: bad caller: width WAS %d(0x%x)\n", aISize, aISize); } if ((aBSize != NS_UNCONSTRAINEDSIZE) && CRAZY_SIZE(aBSize) && !LineContainerFrame()->GetParent()->IsCrazySizeAssertSuppressed()) { - nsFrame::ListTag(stdout, mBlockReflowInput->mFrame); + mBlockReflowInput->mFrame->ListTag(stdout); printf(": Init: bad caller: height WAS %d(0x%x)\n", aBSize, aBSize); } #endif #ifdef NOISY_REFLOW - nsFrame::ListTag(stdout, mBlockReflowInput->mFrame); + mBlockReflowInput->mFrame->ListTag(stdout); printf(": BeginLineReflow: %d,%d,%d,%d impacted=%s %s\n", aICoord, aBCoord, aISize, aBSize, aImpactedByFloats ? "true" : "false", aIsTopOfPage ? "top-of-page" : ""); @@ -239,7 +239,7 @@ void nsLineLayout::BeginLineReflow(nscoord aICoord, nscoord aBCoord, void nsLineLayout::EndLineReflow() { #ifdef NOISY_REFLOW - nsFrame::ListTag(stdout, mBlockReflowInput->mFrame); + mBlockReflowInput->mFrame->ListTag(stdout); printf(": EndLineReflow: width=%d\n", mRootSpan->mICoord - mRootSpan->mIStart); #endif @@ -296,14 +296,14 @@ void nsLineLayout::UpdateBand(WritingMode aWM, if ((availSpace.ISize(lineWM) != NS_UNCONSTRAINEDSIZE) && CRAZY_SIZE(availSpace.ISize(lineWM)) && !LineContainerFrame()->GetParent()->IsCrazySizeAssertSuppressed()) { - nsFrame::ListTag(stdout, mBlockReflowInput->mFrame); + mBlockReflowInput->mFrame->ListTag(stdout); printf(": UpdateBand: bad caller: ISize WAS %d(0x%x)\n", availSpace.ISize(lineWM), availSpace.ISize(lineWM)); } if ((availSpace.BSize(lineWM) != NS_UNCONSTRAINEDSIZE) && CRAZY_SIZE(availSpace.BSize(lineWM)) && !LineContainerFrame()->GetParent()->IsCrazySizeAssertSuppressed()) { - nsFrame::ListTag(stdout, mBlockReflowInput->mFrame); + mBlockReflowInput->mFrame->ListTag(stdout); printf(": UpdateBand: bad caller: BSize WAS %d(0x%x)\n", availSpace.BSize(lineWM), availSpace.BSize(lineWM)); } @@ -322,7 +322,7 @@ void nsLineLayout::UpdateBand(WritingMode aWM, nscoord deltaISize = availSpace.ISize(lineWM) - (mRootSpan->mIEnd - mRootSpan->mIStart); #ifdef NOISY_REFLOW - nsFrame::ListTag(stdout, mBlockReflowInput->mFrame); + mBlockReflowInput->mFrame->ListTag(stdout); printf(": UpdateBand: %d,%d,%d,%d deltaISize=%d deltaICoord=%d\n", availSpace.IStart(lineWM), availSpace.BStart(lineWM), availSpace.ISize(lineWM), availSpace.BSize(lineWM), deltaISize, @@ -396,7 +396,7 @@ void nsLineLayout::BeginSpan(nsIFrame* aFrame, "should no longer be using unconstrained sizes"); #ifdef NOISY_REFLOW nsFrame::IndentBy(stdout, mSpanDepth + 1); - nsFrame::ListTag(stdout, aFrame); + aFrame->ListTag(stdout); printf(": BeginSpan leftEdge=%d rightEdge=%d\n", aIStart, aIEnd); #endif @@ -429,7 +429,7 @@ nscoord nsLineLayout::EndSpan(nsIFrame* aFrame) { NS_ASSERTION(mSpanDepth > 0, "end-span without begin-span"); #ifdef NOISY_REFLOW nsFrame::IndentBy(stdout, mSpanDepth); - nsFrame::ListTag(stdout, aFrame); + aFrame->ListTag(stdout); printf(": EndSpan width=%d\n", mCurrentSpan->mICoord - mCurrentSpan->mIStart); #endif PerSpanData* psd = mCurrentSpan; @@ -758,7 +758,7 @@ void nsLineLayout::ReflowFrame(nsIFrame* aFrame, nsReflowStatus& aReflowStatus, #ifdef REALLY_NOISY_REFLOW nsFrame::IndentBy(stdout, mSpanDepth); printf("%p: Begin ReflowFrame pfd=%p ", psd, pfd); - nsFrame::ListTag(stdout, aFrame); + aFrame->ListTag(stdout); printf("\n"); #endif @@ -976,13 +976,13 @@ void nsLineLayout::ReflowFrame(nsIFrame* aFrame, nsReflowStatus& aReflowStatus, CRAZY_SIZE(reflowOutput.BSize(lineWM))) && !LineContainerFrame()->GetParent()->IsCrazySizeAssertSuppressed()) { printf("nsLineLayout: "); - nsFrame::ListTag(stdout, aFrame); + aFrame->ListTag(stdout); printf(" metrics=%d,%d!\n", reflowOutput.Width(), reflowOutput.Height()); } if ((reflowOutput.Width() == nscoord(0xdeadbeef)) || (reflowOutput.Height() == nscoord(0xdeadbeef))) { printf("nsLineLayout: "); - nsFrame::ListTag(stdout, aFrame); + aFrame->ListTag(stdout); printf(" didn't set w/h %d,%d!\n", reflowOutput.Width(), reflowOutput.Height()); } @@ -1099,7 +1099,7 @@ void nsLineLayout::ReflowFrame(nsIFrame* aFrame, nsReflowStatus& aReflowStatus, #ifdef REALLY_NOISY_REFLOW nsFrame::IndentBy(stdout, mSpanDepth); printf("End ReflowFrame "); - nsFrame::ListTag(stdout, aFrame); + aFrame->ListTag(stdout); printf(" status=%x\n", aReflowStatus); #endif } @@ -1250,10 +1250,10 @@ bool nsLineLayout::CanPlaceFrame(PerFrameData* pfd, bool aNotSafeToBreak, #ifdef NOISY_CAN_PLACE_FRAME if (nullptr != psd->mFrame) { - nsFrame::ListTag(stdout, psd->mFrame->mFrame); + psd->mFrame->mFrame->ListTag(stdout); } printf(": aNotSafeToBreak=%s frame=", aNotSafeToBreak ? "true" : "false"); - nsFrame::ListTag(stdout, pfd->mFrame); + pfd->mFrame->ListTag(stdout); printf(" frameWidth=%d, margins=%d,%d\n", pfd->mBounds.IEnd(lineWM) + endMargin - psd->mICoord, startMargin, endMargin); @@ -1443,7 +1443,7 @@ void nsLineLayout::DumpPerSpanData(PerSpanData* psd, int32_t aIndent) { PerFrameData* pfd = psd->mFirstFrame; while (nullptr != pfd) { nsFrame::IndentBy(stdout, aIndent + 1); - nsFrame::ListTag(stdout, pfd->mFrame); + pfd->mFrame->ListTag(stdout); nsRect rect = pfd->mBounds.GetPhysicalRect(psd->mWritingMode, ContainerSize()); printf(" %d,%d,%d,%d\n", rect.x, rect.y, rect.width, rect.height); @@ -1623,7 +1623,7 @@ void nsLineLayout::PlaceTopBottomFrames(PerSpanData* psd, pfd->mFrame->SetRect(lineWM, pfd->mBounds, containerSize); #ifdef NOISY_BLOCKDIR_ALIGN printf(" "); - nsFrame::ListTag(stdout, pfd->mFrame); + pfd->mFrame->ListTag(stdout); printf(": y=%d dTop=%d [bp.top=%d topLeading=%d]\n", pfd->mBounds.BStart(lineWM), aDistanceFromStart, span ? pfd->mBorderPadding.BStart(lineWM) : 0, @@ -1643,7 +1643,7 @@ void nsLineLayout::PlaceTopBottomFrames(PerSpanData* psd, pfd->mFrame->SetRect(lineWM, pfd->mBounds, containerSize); #ifdef NOISY_BLOCKDIR_ALIGN printf(" "); - nsFrame::ListTag(stdout, pfd->mFrame); + pfd->mFrame->ListTag(stdout); printf(": y=%d\n", pfd->mBounds.BStart(lineWM)); #endif break; @@ -1761,7 +1761,7 @@ void nsLineLayout::VerticalAlignFrames(PerSpanData* psd) { #ifdef NOISY_BLOCKDIR_ALIGN printf("[%sSpan]", (psd == mRootSpan) ? "Root" : ""); - nsFrame::ListTag(stdout, spanFrame); + spanFrame->ListTag(stdout); printf(": preMode=%s strictMode=%s w/h=%d,%d emptyContinuation=%s", preMode ? "yes" : "no", mPresContext->CompatibilityMode() != eCompatibility_NavQuirks ? "yes" @@ -1860,7 +1860,7 @@ void nsLineLayout::VerticalAlignFrames(PerSpanData* psd) { maxBCoord = BLOCKDIR_ALIGN_FRAMES_NO_MAXIMUM; #ifdef NOISY_BLOCKDIR_ALIGN printf("[RootSpan]"); - nsFrame::ListTag(stdout, spanFrame); + spanFrame->ListTag(stdout); printf( ": pass1 valign frames: topEdge=%d minLineBSize=%d " "zeroEffectiveSpanBox=%s\n", @@ -1920,7 +1920,7 @@ void nsLineLayout::VerticalAlignFrames(PerSpanData* psd) { #ifdef NOISY_BLOCKDIR_ALIGN printf("[%sSpan]", (psd == mRootSpan) ? "Root" : ""); - nsFrame::ListTag(stdout, spanFrame); + spanFrame->ListTag(stdout); printf( ": baseLine=%d logicalBSize=%d topLeading=%d h=%d bp=%d,%d " "zeroEffectiveSpanBox=%s\n", @@ -1970,7 +1970,7 @@ void nsLineLayout::VerticalAlignFrames(PerSpanData* psd) { uint8_t verticalAlignEnum = frame->VerticalAlignEnum(); #ifdef NOISY_BLOCKDIR_ALIGN printf(" [frame]"); - nsFrame::ListTag(stdout, frame); + frame->ListTag(stdout); printf(": verticalAlignUnit=%d (enum == %d", verticalAlign.GetUnit(), ((eStyleUnit_Enumerated == verticalAlign.GetUnit()) ? verticalAlign.GetIntValue() @@ -2491,9 +2491,9 @@ bool nsLineLayout::TrimTrailingWhiteSpaceIn(PerSpanData* psd, pfd = pfd->Last(); while (nullptr != pfd) { #ifdef REALLY_NOISY_TRIM - nsFrame::ListTag(stdout, psd->mFrame->mFrame); + psd->mFrame->mFrame->ListTag(stdout); printf(": attempting trim of "); - nsFrame::ListTag(stdout, pfd->mFrame); + pfd->mFrame->ListTag(stdout); printf("\n"); #endif PerSpanData* childSpan = pfd->mSpan; @@ -2556,9 +2556,9 @@ bool nsLineLayout::TrimTrailingWhiteSpaceIn(PerSpanData* psd, ->TrimTrailingWhiteSpace( mBlockReflowInput->mRenderingContext->GetDrawTarget()); #ifdef NOISY_TRIM - nsFrame::ListTag(stdout, psd->mFrame->mFrame); + psd->mFrame->mFrame->ListTag(stdout); printf(": trim of "); - nsFrame::ListTag(stdout, pfd->mFrame); + pfd->mFrame->ListTag(stdout); printf(" returned %d\n", trimOutput.mDeltaWidth); #endif @@ -3067,7 +3067,7 @@ void nsLineLayout::TextAlignLine(nsLineBox* aLine, bool aIsLastLine) { nscoord availISize = psd->mIEnd - psd->mIStart; nscoord remainingISize = availISize - aLine->ISize(); #ifdef NOISY_INLINEDIR_ALIGN - nsFrame::ListTag(stdout, mBlockReflowInput->mFrame); + mBlockReflowInput->mFrame->ListTag(stdout); printf(": availISize=%d lineBounds.IStart=%d lineISize=%d delta=%d\n", availISize, aLine->IStart(), aLine->ISize(), remainingISize); #endif