Bug 1313083 - Fix NOISY_BLOCKDIR_ALIGN line layout debug flag. draft
authorJeremy Chen <jeremychen@mozilla.com>
Wed, 26 Oct 2016 23:15:35 +0800
changeset 429816 bdc06298044eda33d2580e07b809c00269cdcc3d
parent 429741 d26ac63f1b81c3fce35448a7c502e95e0b5c56c0
child 429817 5fb7c9bb5ca9ffbb306dc67300d060bebbf8ce1a
push id33664
push userjichen@mozilla.com
push dateWed, 26 Oct 2016 15:16:12 +0000
bugs1313083, 1277129, 1094914
milestone52.0a1
Bug 1313083 - Fix NOISY_BLOCKDIR_ALIGN line layout debug flag. 1. frame was mis-renamed to mFrame in Bug 1277129. 2. frameWM should've been removed in Bug 1094914. MozReview-Commit-ID: qMv6L2vbrV
layout/generic/nsLineLayout.cpp
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -1792,17 +1792,16 @@ nsLineLayout::VerticalAlignFrames(PerSpa
   nsFrame::ListTag(stdout, spanFrame);
   printf(": preMode=%s strictMode=%s w/h=%d,%d emptyContinuation=%s",
          preMode ? "yes" : "no",
          mPresContext->CompatibilityMode() != eCompatibility_NavQuirks ? "yes" : "no",
          spanFramePFD->mBounds.ISize(lineWM),
          spanFramePFD->mBounds.BSize(lineWM),
          emptyContinuation ? "yes" : "no");
   if (psd != mRootSpan) {
-    WritingMode frameWM = spanFramePFD->mWritingMode;
     printf(" bp=%d,%d,%d,%d margin=%d,%d,%d,%d",
            spanFramePFD->mBorderPadding.Top(lineWM),
            spanFramePFD->mBorderPadding.Right(lineWM),
            spanFramePFD->mBorderPadding.Bottom(lineWM),
            spanFramePFD->mBorderPadding.Left(lineWM),
            spanFramePFD->mMargin.Top(lineWM),
            spanFramePFD->mMargin.Right(lineWM),
            spanFramePFD->mMargin.Bottom(lineWM),
@@ -1999,17 +1998,17 @@ nsLineLayout::VerticalAlignFrames(PerSpa
     }
 
     // Get vertical-align property ("vertical-align" is the CSS name for
     // block-direction align)
     const nsStyleCoord& verticalAlign = frame->StyleDisplay()->mVerticalAlign;
     uint8_t verticalAlignEnum = frame->VerticalAlignEnum();
 #ifdef NOISY_BLOCKDIR_ALIGN
     printf("  [frame]");
-    nsFrame::ListTag(stdout, mFrame);
+    nsFrame::ListTag(stdout, frame);
     printf(": verticalAlignUnit=%d (enum == %d",
            verticalAlign.GetUnit(),
            ((eStyleUnit_Enumerated == verticalAlign.GetUnit())
             ? verticalAlign.GetIntValue()
             : -1));
     if (verticalAlignEnum != nsIFrame::eInvalidVerticalAlign) {
       printf(", after SVG dominant-baseline conversion == %d",
              verticalAlignEnum);
@@ -2381,17 +2380,17 @@ nsLineLayout::VerticalAlignFrames(PerSpa
       (maxBCoord == BLOCKDIR_ALIGN_FRAMES_NO_MAXIMUM)) {
     minBCoord = maxBCoord = baselineBCoord;
   }
 
   if (psd != mRootSpan && zeroEffectiveSpanBox) {
 #ifdef NOISY_BLOCKDIR_ALIGN
     printf("   [span]adjusting for zeroEffectiveSpanBox\n");
     printf("     Original: minBCoord=%d, maxBCoord=%d, bSize=%d, ascent=%d, logicalBSize=%d, topLeading=%d, bottomLeading=%d\n",
-           minBCoord, maxBCoord, spanFramePFD->mBounds.BSize(frameWM),
+           minBCoord, maxBCoord, spanFramePFD->mBounds.BSize(lineWM),
            spanFramePFD->mAscent,
            psd->mLogicalBSize, psd->mBStartLeading, psd->mBEndLeading);
 #endif
     nscoord goodMinBCoord =
       spanFramePFD->mBorderPadding.BStart(lineWM) - psd->mBStartLeading;
     nscoord goodMaxBCoord = goodMinBCoord + psd->mLogicalBSize;
 
     // For cases like the one in bug 714519 (text-decoration placement