diff options
Diffstat (limited to 'WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm')
-rw-r--r-- | WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm b/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm index a7ec03a..72e3369 100644 --- a/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm +++ b/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm @@ -181,11 +181,10 @@ MemoryActivatedFont::~MemoryActivatedFont() // that was picked in the end. The caller is responsible for calling // CFRelease() on this parameter when done with it. // * fontID - on output, the ID corresponding to nsFont. -void FontPlatformData::loadFont(NSFont* nsFont, float fontSize, NSFont*& outNSFont, CGFontRef& cgFont, ATSUFontID& fontID) +void FontPlatformData::loadFont(NSFont* nsFont, float fontSize, NSFont*& outNSFont, CGFontRef& cgFont) { outNSFont = nsFont; cgFont = CTFontCopyGraphicsFont(toCTFontRef(outNSFont), 0); - MemoryActivatedFont* memFont = 0; if (OutOfProcessFontLoadingEnabled() && outNSFont && cgFont && isLastResortFont(cgFont)) { // Release old CGFontRef since it points at the LastResort font which we don't want. CFRelease(cgFont); @@ -206,12 +205,6 @@ void FontPlatformData::loadFont(NSFont* nsFont, float fontSize, NSFont*& outNSFo cgFont = CTFontCopyGraphicsFont(toCTFontRef(outNSFont), 0); } } - - if (memFont) { - fontID = m_inMemoryFont->atsFontRef(); - } else { - fontID = CTFontGetPlatformFont(toCTFontRef(outNSFont), 0); - } } } // namespace WebCore |