зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1312379 part 4 - Rename GetBaseline() to BaselineBOffset(). r=me
This commit is contained in:
Родитель
562b840a02
Коммит
99856fc256
|
@ -493,7 +493,7 @@ nscoord
|
|||
nsBlockFrame::GetLogicalBaseline(WritingMode aWM) const
|
||||
{
|
||||
auto lastBaseline =
|
||||
GetBaseline(aWM, BaselineSharingGroup::eLast, AlignmentContext::eInline);
|
||||
BaselineBOffset(aWM, BaselineSharingGroup::eLast, AlignmentContext::eInline);
|
||||
return BSize(aWM) - lastBaseline;
|
||||
}
|
||||
|
||||
|
|
|
@ -6723,7 +6723,7 @@ nsGridContainerFrame::SynthesizeBaseline(
|
|||
isOrthogonal ? grid->GetIBaseline(aGroup, &baseline) :
|
||||
grid->GetBBaseline(aGroup, &baseline);
|
||||
} else if (!isOrthogonal && aGridOrderItem.mIsInEdgeTrack) {
|
||||
baseline = child->GetBaseline(childWM, aGroup, AlignmentContext::eGrid);
|
||||
baseline = child->BaselineBOffset(childWM, aGroup, AlignmentContext::eGrid);
|
||||
} else {
|
||||
baseline = ::SynthesizeBaselineFromBorderBox(aGroup, childWM, size);
|
||||
}
|
||||
|
|
|
@ -1271,9 +1271,9 @@ public:
|
|||
* @param aBaselineOffset out-param, only valid if the method returns true
|
||||
* (implemented in nsIFrameInlines.h)
|
||||
*/
|
||||
inline nscoord GetBaseline(mozilla::WritingMode aWM,
|
||||
BaselineSharingGroup aBaselineGroup,
|
||||
AlignmentContext aAlignmentContext) const;
|
||||
inline nscoord BaselineBOffset(mozilla::WritingMode aWM,
|
||||
BaselineSharingGroup aBaselineGroup,
|
||||
AlignmentContext aAlignmentContext) const;
|
||||
|
||||
/**
|
||||
* XXX: this method is taking over the role that GetLogicalBaseline has.
|
||||
|
|
|
@ -144,9 +144,9 @@ nsIFrame::SynthesizeBaselineBOffsetFromBorderBox(
|
|||
}
|
||||
|
||||
nscoord
|
||||
nsIFrame::GetBaseline(mozilla::WritingMode aWM,
|
||||
BaselineSharingGroup aBaselineGroup,
|
||||
AlignmentContext aAlignmentContext) const
|
||||
nsIFrame::BaselineBOffset(mozilla::WritingMode aWM,
|
||||
BaselineSharingGroup aBaselineGroup,
|
||||
AlignmentContext aAlignmentContext) const
|
||||
{
|
||||
MOZ_ASSERT(!aWM.IsOrthogonalTo(GetWritingMode()));
|
||||
nscoord baseline;
|
||||
|
|
Загрузка…
Ссылка в новой задаче