diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/platform/graphics/mac/SimpleFontDataATSUI.mm | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/platform/graphics/mac/SimpleFontDataATSUI.mm')
| -rw-r--r-- | WebCore/platform/graphics/mac/SimpleFontDataATSUI.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/mac/SimpleFontDataATSUI.mm b/WebCore/platform/graphics/mac/SimpleFontDataATSUI.mm index beea018..4b2e7b2 100644 --- a/WebCore/platform/graphics/mac/SimpleFontDataATSUI.mm +++ b/WebCore/platform/graphics/mac/SimpleFontDataATSUI.mm @@ -48,8 +48,8 @@ void SimpleFontData::checkShapesArabic() const ASSERT(!m_checkedShapesArabic); m_checkedShapesArabic = true; - - ATSUFontID fontID = m_platformData.m_atsuFontID; + + ATSUFontID fontID = m_platformData.ctFont() ? CTFontGetPlatformFont(m_platformData.ctFont(), 0) : 0; if (!fontID) { LOG_ERROR("unable to get ATSUFontID for %@", m_platformData.font()); return; @@ -59,7 +59,7 @@ void SimpleFontData::checkShapesArabic() const // heuristic is that if such a font has a glyph metamorphosis table, then // it includes shaping information for Arabic. FourCharCode tables[] = { 'morx', 'mort' }; - for (unsigned i = 0; i < sizeof(tables) / sizeof(tables[0]); ++i) { + for (size_t i = 0; i < WTF_ARRAY_LENGTH(tables); ++i) { ByteCount tableSize; OSStatus status = ATSFontGetTable(fontID, tables[i], 0, 0, 0, &tableSize); if (status == noErr) { |