зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1230413 (part 3) - Remove unused gfxContext argument from SetSpaceGlyphIfSimple(). r=jfkthame.
--HG-- extra : rebase_source : fbd23567601680bd165a72abf1ca6a70f2e3a453
This commit is contained in:
Родитель
4fdc67c5bd
Коммит
02842898a0
|
@ -2886,8 +2886,7 @@ gfxFont::SplitAndInitTextRun(gfxContext *aContext,
|
|||
gfxTextRunFactory::TEXT_ORIENT_VERTICAL_SIDEWAYS_RIGHT;
|
||||
}
|
||||
if (boundary != ' ' ||
|
||||
!aTextRun->SetSpaceGlyphIfSimple(this, aContext,
|
||||
aRunStart + i, ch,
|
||||
!aTextRun->SetSpaceGlyphIfSimple(this, aRunStart + i, ch,
|
||||
orientation)) {
|
||||
// Currently, the only "boundary" characters we recognize are
|
||||
// space and no-break space, which are both 8-bit, so we force
|
||||
|
|
|
@ -1321,8 +1321,7 @@ void
|
|||
gfxTextRun::SetSpaceGlyph(gfxFont *aFont, gfxContext *aContext,
|
||||
uint32_t aCharIndex, uint16_t aOrientation)
|
||||
{
|
||||
if (SetSpaceGlyphIfSimple(aFont, aContext, aCharIndex, ' ',
|
||||
aOrientation)) {
|
||||
if (SetSpaceGlyphIfSimple(aFont, aCharIndex, ' ', aOrientation)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -1350,9 +1349,8 @@ gfxTextRun::SetSpaceGlyph(gfxFont *aFont, gfxContext *aContext,
|
|||
}
|
||||
|
||||
bool
|
||||
gfxTextRun::SetSpaceGlyphIfSimple(gfxFont *aFont, gfxContext *aContext,
|
||||
uint32_t aCharIndex, char16_t aSpaceChar,
|
||||
uint16_t aOrientation)
|
||||
gfxTextRun::SetSpaceGlyphIfSimple(gfxFont* aFont, uint32_t aCharIndex,
|
||||
char16_t aSpaceChar, uint16_t aOrientation)
|
||||
{
|
||||
uint32_t spaceGlyph = aFont->GetSpaceGlyph();
|
||||
if (!spaceGlyph || !CompressedGlyph::IsSimpleGlyphID(spaceGlyph)) {
|
||||
|
|
|
@ -514,9 +514,8 @@ public:
|
|||
// Returns true if it was able to set simple glyph data for the space;
|
||||
// if it returns false, the caller needs to fall back to some other
|
||||
// means to create the necessary (detailed) glyph data.
|
||||
bool SetSpaceGlyphIfSimple(gfxFont *aFont, gfxContext *aContext,
|
||||
uint32_t aCharIndex, char16_t aSpaceChar,
|
||||
uint16_t aOrientation);
|
||||
bool SetSpaceGlyphIfSimple(gfxFont *aFont, uint32_t aCharIndex,
|
||||
char16_t aSpaceChar, uint16_t aOrientation);
|
||||
|
||||
// Record the positions of specific characters that layout may need to
|
||||
// detect in the textrun, even though it doesn't have an explicit copy
|
||||
|
|
Загрузка…
Ссылка в новой задаче