corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1038663 (part 2, attempt 2) - Move GetFirstFontMetrics() up. r=heycam.

Browse Source
This commit is contained in:
Nicholas Nethercote
2015-11-08 13:52:58 -08:00
parent d8bab1558a
commit 4a257d059c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
layout/generic/nsTextFrame.cpp
View File

@@ -1597,6 +1597,16 @@ HasTerminalNewline(const nsTextFrame* aFrame)
return frag->CharAt(aFrame->GetContentEnd() - 1) == '\n'; return frag->CharAt(aFrame->GetContentEnd() - 1) == '\n';
} }
static gfxFont::Metrics
GetFirstFontMetrics(gfxFontGroup* aFontGroup, bool aVerticalMetrics)
{
if (!aFontGroup)
return gfxFont::Metrics();
gfxFont* font = aFontGroup->GetFirstValidFont();
return font->GetMetrics(aVerticalMetrics ? gfxFont::eVertical
: gfxFont::eHorizontal);
}
static nscoord static nscoord
LetterSpacing(nsIFrame* aFrame, const nsStyleText* aStyleText = nullptr) LetterSpacing(nsIFrame* aFrame, const nsStyleText* aStyleText = nullptr)
{ {
@@ -1826,16 +1836,6 @@ GetHyphenTextRun(gfxTextRun* aTextRun, gfxContext* aContext, nsTextFrame* aTextF
MakeHyphenTextRun(ctx, aTextRun->GetAppUnitsPerDevUnit()); MakeHyphenTextRun(ctx, aTextRun->GetAppUnitsPerDevUnit());
} }
static gfxFont::Metrics
GetFirstFontMetrics(gfxFontGroup* aFontGroup, bool aVerticalMetrics)
{
if (!aFontGroup)
return gfxFont::Metrics();
gfxFont* font = aFontGroup->GetFirstValidFont();
return font->GetMetrics(aVerticalMetrics ? gfxFont::eVertical
: gfxFont::eHorizontal);
}
PR_STATIC_ASSERT(NS_STYLE_WHITESPACE_NORMAL == 0); PR_STATIC_ASSERT(NS_STYLE_WHITESPACE_NORMAL == 0);
PR_STATIC_ASSERT(NS_STYLE_WHITESPACE_PRE == 1); PR_STATIC_ASSERT(NS_STYLE_WHITESPACE_PRE == 1);
PR_STATIC_ASSERT(NS_STYLE_WHITESPACE_NOWRAP == 2); PR_STATIC_ASSERT(NS_STYLE_WHITESPACE_NOWRAP == 2);