diff options
| author | graouts@apple.com <graouts@apple.com> | 2013-06-11 11:50:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-11 15:53:27 +0200 |
| commit | 1810e3848d15ffbe9529f53866fc0ede8d947fef (patch) | |
| tree | 1076da30c6cdf1623fb3d2f5455eef0773802968 | |
| parent | b3b8ed036fb802f638cac9c637065363fba8b4fa (diff) | |
Glyphs may fail to render when using SVG fontv5.1.0-rc1
https://bugs.webkit.org/show_bug.cgi?id=115193
Reviewed by Simon Fraser.
Calling SimpleFontData::applyTransforms() when the font used is
an SVG font makes little sense since Core Text doesn’t know or
understand SVG fonts and would be passed some other, unrelated
platform font.
* platform/graphics/SimpleFontData.h:
(WebCore::SimpleFontData::applyTransforms):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@149144 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Task-number: QTBUG-31663
Change-Id: Ic631da7c64e477c4f6199053584d36827bd3a5b1
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
| -rw-r--r-- | Source/WebCore/platform/graphics/SimpleFontData.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/SimpleFontData.h b/Source/WebCore/platform/graphics/SimpleFontData.h index 8621ca596..a99482404 100644 --- a/Source/WebCore/platform/graphics/SimpleFontData.h +++ b/Source/WebCore/platform/graphics/SimpleFontData.h @@ -200,6 +200,8 @@ public: bool applyTransforms(GlyphBufferGlyph* glyphs, GlyphBufferAdvance* advances, size_t glyphCount, TypesettingFeatures typesettingFeatures) const { + if (isSVGFont()) + return false; #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080 wkCTFontTransformOptions options = (typesettingFeatures & Kerning ? wkCTFontTransformApplyPositioning : 0) | (typesettingFeatures & Ligatures ? wkCTFontTransformApplyShaping : 0); return wkCTFontTransformGlyphs(m_platformData.ctFont(), glyphs, reinterpret_cast<CGSize*>(advances), glyphCount, options); |