From 50af66293de8bd5dd9fd9141a45d9415b5c688aa Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Sat, 7 Nov 2015 09:54:21 +0400
Subject: QTextEngine: Do not disable graphite2 HB shaper backend

This fixes-up bf013c9e745c63cb112be4d3a37027ff997927dd by specifying
graphite2 shaper in a "safe" shaper list, one used for non-CoreText
font engines (currently, FreeType font engine only).

Make the the comment and the code a bit cleaner about the fallback
shaper list.

Change-Id: Ib0cedc0b593023c9ee771e8e98c314d9c8f13037
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
---
 src/gui/text/qtextengine.cpp | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'src/gui/text/qtextengine.cpp')

diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 6b98c14205..530871f65b 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1120,15 +1120,6 @@ QT_BEGIN_INCLUDE_NAMESPACE
 
 QT_END_INCLUDE_NAMESPACE
 
-#if defined(Q_OS_OSX) && !defined(QT_NO_FREETYPE)
-static const char *s_shapersForOsxFreeType[] =
-{
-    "ot",
-    "fallback",
-    Q_NULLPTR
-};
-#endif
-
 int QTextEngine::shapeTextWithHarfbuzzNG(const QScriptItem &si, const ushort *string, int itemLength, QFontEngine *fontEngine, const QVector<uint> &itemBoundaries, bool kerningEnabled) const
 {
     uint glyphs_shaped = 0;
@@ -1182,13 +1173,21 @@ int QTextEngine::shapeTextWithHarfbuzzNG(const QScriptItem &si, const ushort *st
             const int num_features = 1;
 
             const char *const *shaper_list = Q_NULLPTR;
-#if defined(Q_OS_OSX) && !defined(QT_NO_FREETYPE)
-            // What's behind QFontEngine::FaceData::user_data isn't compatible between CoreText and
-            // FreeType font engines - specifically functions in hb-coretext.cc would run into undefined
-            // behavior with data from the FreeType engine. The OpenType shaper works with that engine.
-            if (actualFontEngine->type() == QFontEngine::Freetype)
-                shaper_list = s_shapersForOsxFreeType;
+#if defined(Q_OS_DARWIN)
+            // What's behind QFontEngine::FaceData::user_data isn't compatible between different font engines
+            // - specifically functions in hb-coretext.cc would run into undefined behavior with data
+            // from non-CoreText engine. The other shapers works with that engine just fine.
+            if (actualFontEngine->type() != QFontEngine::Mac) {
+                static const char *s_shaper_list_without_coretext[] = {
+                    "graphite2",
+                    "ot",
+                    "fallback",
+                    Q_NULLPTR
+                };
+                shaper_list = s_shaper_list_without_coretext;
+            }
 #endif
+
             bool shapedOk = hb_shape_full(hb_font, buffer, features, num_features, shaper_list);
             if (Q_UNLIKELY(!shapedOk)) {
                 hb_buffer_destroy(buffer);
-- 
cgit v1.2.3


From c1da13f6db756a9b23c46193304156c5e10f3bc1 Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Sat, 7 Nov 2015 09:54:46 +0400
Subject: QTextEngine: Apply CoreText specific post-processing for QFE::Mac
 only

These tricks has no meaning to other font engines (i.e. to FreeType).

Change-Id: I0410693d4d159367d760433062506691dc7c4610
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
---
 src/gui/text/qtextengine.cpp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'src/gui/text/qtextengine.cpp')

diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 530871f65b..50a242d81e 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1267,19 +1267,20 @@ int QTextEngine::shapeTextWithHarfbuzzNG(const QScriptItem &si, const ushort *st
                 g.glyphs[i] |= (engineIdx << 24);
         }
 
-#ifdef Q_OS_MAC
-        // CTRunGetPosition has a bug which applies matrix on 10.6, so we disable
-        // scaling the advances for this particular version
-        if (actualFontEngine->fontDef.stretch != 100
-                && QSysInfo::MacintoshVersion != QSysInfo::MV_10_6) {
-            QFixed stretch = QFixed(int(actualFontEngine->fontDef.stretch)) / QFixed(100);
-            for (uint i = 0; i < num_glyphs; ++i)
-                g.advances[i] *= stretch;
-        }
-
-        if (actualFontEngine->fontDef.styleStrategy & QFont::ForceIntegerMetrics) {
-            for (uint i = 0; i < num_glyphs; ++i)
-                g.advances[i] = g.advances[i].round();
+#ifdef Q_OS_DARWIN
+        if (actualFontEngine->type() == QFontEngine::Mac) {
+            // CTRunGetPosition has a bug which applies matrix on 10.6, so we disable
+            // scaling the advances for this particular version
+            if (QSysInfo::MacintoshVersion != QSysInfo::MV_10_6 && actualFontEngine->fontDef.stretch != 100) {
+                QFixed stretch = QFixed(int(actualFontEngine->fontDef.stretch)) / QFixed(100);
+                for (uint i = 0; i < num_glyphs; ++i)
+                    g.advances[i] *= stretch;
+            }
+
+            if (actualFontEngine->fontDef.styleStrategy & QFont::ForceIntegerMetrics) {
+                for (uint i = 0; i < num_glyphs; ++i)
+                    g.advances[i] = g.advances[i].round();
+            }
         }
 #endif
 
-- 
cgit v1.2.3