--- 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