From 0e25a1738a9f3f65d3eed1268859e9a4b17ba484 Mon Sep 17 00:00:00 2001 From: "bashi@chromium.org" Date: Fri, 29 Jun 2012 02:37:43 +0000 Subject: [PATCH] [Chromium] CTFontCopyTable of MacOSX10.5 SDK doesn't work for layout tables https://bugs.webkit.org/show_bug.cgi?id=90235 Reviewed by Kent Tamura. Use CGFontCopyTableForTag instead. No new tests. css3/font-feature-settings-rendering.html should pass. I'll rebase expectations once bots get the result. * platform/graphics/harfbuzz/ng/HarfBuzzFaceCoreText.cpp: (WebCore::harfbuzzCoreTextGetTable): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121510 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 14 ++++++++++++++ .../platform/graphics/harfbuzz/ng/HarfBuzzFaceCoreText.cpp | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 52a0b72..b3f6890 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,17 @@ +2012-06-28 Kenichi Ishibashi + + [Chromium] CTFontCopyTable of MacOSX10.5 SDK doesn't work for layout tables + https://bugs.webkit.org/show_bug.cgi?id=90235 + + Reviewed by Kent Tamura. + + Use CGFontCopyTableForTag instead. + + No new tests. css3/font-feature-settings-rendering.html should pass. I'll rebase expectations once bots get the result. + + * platform/graphics/harfbuzz/ng/HarfBuzzFaceCoreText.cpp: + (WebCore::harfbuzzCoreTextGetTable): + 2012-06-28 Philip Rogers Add preventative assert in SVGTRefElement diff --git a/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzFaceCoreText.cpp b/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzFaceCoreText.cpp index 6209e70..966589d 100644 --- a/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzFaceCoreText.cpp +++ b/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzFaceCoreText.cpp @@ -109,8 +109,10 @@ static void releaseTableData(void* userData) static hb_blob_t* harfbuzzCoreTextGetTable(hb_face_t* face, hb_tag_t tag, void* userData) { FontPlatformData* platformData = reinterpret_cast(userData); - CTFontRef ctFont = platformData->ctFont(); - CFDataRef cfData = CTFontCopyTable(ctFont, tag, kCTFontTableOptionNoOptions); + // It seems that CTFontCopyTable of MacOSX10.5 sdk doesn't work for + // OpenType layout tables(GDEF, GSUB, GPOS). Use CGFontCopyTableForTag instead. + CGFontRef cgFont = platformData->cgFont(); + CFDataRef cfData = CGFontCopyTableForTag(cgFont, tag); if (!cfData) return 0; -- 2.7.4