зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1038663 (part 3) - Factor out space width computation. r=heycam.
This will be reused in a subsequent patch. --HG-- extra : rebase_source : 67d14767298841dbe3f38d2f7a1c89dfcec122dd
This commit is contained in:
Родитель
0edc52ad5a
Коммит
a6e88b52f4
|
@ -1607,6 +1607,19 @@ GetFirstFontMetrics(gfxFontGroup* aFontGroup, bool aVerticalMetrics)
|
|||
: gfxFont::eHorizontal);
|
||||
}
|
||||
|
||||
static gfxFloat
|
||||
GetSpaceWidthAppUnits(gfxTextRun* aTextRun)
|
||||
{
|
||||
// Round the space width when converting to appunits the same way textruns
|
||||
// do.
|
||||
gfxFloat spaceWidthAppUnits =
|
||||
NS_round(GetFirstFontMetrics(aTextRun->GetFontGroup(),
|
||||
aTextRun->UseCenterBaseline()).spaceWidth *
|
||||
aTextRun->GetAppUnitsPerDevUnit());
|
||||
|
||||
return spaceWidthAppUnits;
|
||||
}
|
||||
|
||||
static nscoord
|
||||
LetterSpacing(nsIFrame* aFrame, const nsStyleText* aStyleText = nullptr)
|
||||
{
|
||||
|
@ -3225,14 +3238,8 @@ ComputeTabWidthAppUnits(nsIFrame* aFrame, gfxTextRun* aTextRun)
|
|||
{
|
||||
// Get the number of spaces from CSS -moz-tab-size
|
||||
const nsStyleText* textStyle = aFrame->StyleText();
|
||||
|
||||
// Round the space width when converting to appunits the same way
|
||||
// textruns do
|
||||
gfxFloat spaceWidthAppUnits =
|
||||
NS_round(GetFirstFontMetrics(aTextRun->GetFontGroup(),
|
||||
aTextRun->UseCenterBaseline()).spaceWidth *
|
||||
aTextRun->GetAppUnitsPerDevUnit());
|
||||
return textStyle->mTabSize * spaceWidthAppUnits;
|
||||
|
||||
return textStyle->mTabSize * GetSpaceWidthAppUnits(aTextRun);
|
||||
}
|
||||
|
||||
// aX and the result are in whole appunits.
|
||||
|
|
Загрузка…
Ссылка в новой задаче