Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1055667 part 2 - Remove unnecessary param of SetBSizeFromFontMetrics. r=dbaron

Browse Source 
--HG--
extra : source : aa79c8cebf3e2ab0fd4335eaa3c630a43dbe81f2
This commit is contained in:
Xidorn Quan 2015-01-15 20:02:11 +11:00
parent 60d4f4ddf2
commit 1bf1df7b1e
6 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/base/nsLayoutUtils.cpp
View File

@ -7796,8 +7796,7 @@ nsLayoutUtils::IsOutlineStyleAutoEnabled()
/* static */ void
nsLayoutUtils::SetBSizeFromFontMetrics(const nsIFrame* aFrame,
nsHTMLReflowMetrics& aMetrics,
const nsHTMLReflowState& aReflowState,
LogicalMargin aFramePadding,
const LogicalMargin& aFramePadding,
WritingMode aLineWM,
WritingMode aFrameWM)
{
@ -7825,6 +7824,5 @@ nsLayoutUtils::SetBSizeFromFontMetrics(const nsIFrame* aFrame,
}
aMetrics.SetBlockStartAscent(aMetrics.BlockStartAscent() +
aFramePadding.BStart(aFrameWM));
aMetrics.BSize(aLineWM) +=
aReflowState.ComputedLogicalBorderPadding().BStartEnd(aFrameWM);
aMetrics.BSize(aLineWM) += aFramePadding.BStartEnd(aFrameWM);
}

3
layout/base/nsLayoutUtils.h
View File

@ -2540,8 +2540,7 @@ public:
static void SetBSizeFromFontMetrics(const nsIFrame* aFrame,
nsHTMLReflowMetrics& aMetrics,
const nsHTMLReflowState& aReflowState,
mozilla::LogicalMargin aFramePadding,
const mozilla::LogicalMargin& aFramePadding,
mozilla::WritingMode aLineWM,
mozilla::WritingMode aFrameWM);

3
layout/generic/nsFirstLetterFrame.cpp
View File

@ -244,8 +244,7 @@ nsFirstLetterFrame::Reflow(nsPresContext* aPresContext,
aMetrics.ISize(lineWM) = ll->EndSpan(this) + bp.IStartEnd(wm);
ll->SetInFirstLetter(false);
nsLayoutUtils::SetBSizeFromFontMetrics(this, aMetrics, aReflowState,
bp, lineWM, wm);
nsLayoutUtils::SetBSizeFromFontMetrics(this, aMetrics, bp, lineWM, wm);
}
// Ensure that the overflow rect contains the child textframe's overflow rect.

2
layout/generic/nsInlineFrame.cpp
View File

@ -733,7 +733,7 @@ nsInlineFrame::ReflowFrames(nsPresContext* aPresContext,
aMetrics.ISize(lineWM) += framePadding.IEnd(frameWM);
}
nsLayoutUtils::SetBSizeFromFontMetrics(this, aMetrics, aReflowState,
nsLayoutUtils::SetBSizeFromFontMetrics(this, aMetrics,
framePadding, lineWM, frameWM);
// For now our overflow area is zero. The real value will be

2
layout/generic/nsRubyBaseContainerFrame.cpp
View File

@ -497,7 +497,7 @@ nsRubyBaseContainerFrame::Reflow(nsPresContext* aPresContext,
lineLayout->EndLineReflow();
}
nsLayoutUtils::SetBSizeFromFontMetrics(this, aDesiredSize, aReflowState,
nsLayoutUtils::SetBSizeFromFontMetrics(this, aDesiredSize,
borderPadding, lineWM, frameWM);
}

2
layout/generic/nsRubyFrame.cpp
View File

@ -204,7 +204,7 @@ nsRubyFrame::Reflow(nsPresContext* aPresContext,
MOZ_ASSERT(!NS_FRAME_OVERFLOW_IS_INCOMPLETE(aStatus));
aDesiredSize.ISize(lineWM) = aReflowState.mLineLayout->EndSpan(this);
nsLayoutUtils::SetBSizeFromFontMetrics(this, aDesiredSize, aReflowState,
nsLayoutUtils::SetBSizeFromFontMetrics(this, aDesiredSize,
borderPadding, lineWM, frameWM);
}