| Index: Source/platform/fonts/Font.h
|
| diff --git a/Source/platform/fonts/Font.h b/Source/platform/fonts/Font.h
|
| index fa832473797a6c5d15fe5a014e779ad662e5ee91..db341a2cb46b6075012042a6576067dc0b61e19a 100644
|
| --- a/Source/platform/fonts/Font.h
|
| +++ b/Source/platform/fonts/Font.h
|
| @@ -127,9 +127,7 @@ public:
|
| {
|
| return glyphDataAndPageForCharacter(c, mirror, spaceNormalize, variant).first;
|
| }
|
| -#if OS(MACOSX)
|
| - const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, size_t length, FontDataVariant) const;
|
| -#endif
|
| +
|
| std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32&, bool mirror, bool normalizeSpace = false, FontDataVariant = AutoVariant) const;
|
| bool primaryFontHasGlyphForCharacter(UChar32) const;
|
|
|
|
|