From 6c547142d5b80619ca751edade8429f6fddad853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Thu, 30 Mar 2017 15:32:12 +0200
Subject: Move FreeType font engine creation for QRawFont into factory function

So that the logic can be used without subclassing the FreeType font database.

Change-Id: Ib1ac0e1948ce18003b8eda0c1e8fbb3c7e6c8360
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 .../fontdatabases/freetype/qfontengine_ft.cpp      | 50 ++++++++++++++++++++++
 .../fontdatabases/freetype/qfontengine_ft_p.h      |  1 +
 .../freetype/qfreetypefontdatabase.cpp             | 49 +--------------------
 3 files changed, 52 insertions(+), 48 deletions(-)

(limited to 'src/platformsupport/fontdatabases')

diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
index 98bf91fa9d..3895681507 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
@@ -47,6 +47,7 @@
 #include <qguiapplication.h>
 #include <qscreen.h>
 #include <qpa/qplatformscreen.h>
+#include <QtCore/QUuid>
 
 #ifndef QT_NO_FREETYPE
 
@@ -706,6 +707,55 @@ QFontEngineFT *QFontEngineFT::create(const QFontDef &fontDef, FaceId faceId, con
     return engine.take();
 }
 
+namespace {
+    class QFontEngineFTRawData: public QFontEngineFT
+    {
+    public:
+        QFontEngineFTRawData(const QFontDef &fontDef) : QFontEngineFT(fontDef)
+        {
+        }
+
+        void updateFamilyNameAndStyle()
+        {
+            fontDef.family = QString::fromLatin1(freetype->face->family_name);
+
+            if (freetype->face->style_flags & FT_STYLE_FLAG_ITALIC)
+                fontDef.style = QFont::StyleItalic;
+
+            if (freetype->face->style_flags & FT_STYLE_FLAG_BOLD)
+                fontDef.weight = QFont::Bold;
+        }
+
+        bool initFromData(const QByteArray &fontData)
+        {
+            FaceId faceId;
+            faceId.filename = "";
+            faceId.index = 0;
+            faceId.uuid = QUuid::createUuid().toByteArray();
+
+            return init(faceId, true, Format_None, fontData);
+        }
+    };
+}
+
+QFontEngineFT *QFontEngineFT::create(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference)
+{
+    QFontDef fontDef;
+    fontDef.pixelSize = pixelSize;
+    fontDef.hintingPreference = hintingPreference;
+
+    QFontEngineFTRawData *fe = new QFontEngineFTRawData(fontDef);
+    if (!fe->initFromData(fontData)) {
+        delete fe;
+        return 0;
+    }
+
+    fe->updateFamilyNameAndStyle();
+    fe->setQtDefaultHintStyle(static_cast<QFont::HintingPreference>(fontDef.hintingPreference));
+
+    return fe;
+}
+
 QFontEngineFT::QFontEngineFT(const QFontDef &fd)
     : QFontEngine(Freetype)
 {
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
index fc923d196b..2993e3b616 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
@@ -294,6 +294,7 @@ private:
     HintStyle defaultHintStyle() const { return default_hint_style; }
 
     static QFontEngineFT *create(const QFontDef &fontDef, FaceId faceId, const QByteArray &fontData = QByteArray());
+    static QFontEngineFT *create(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference);
 
 protected:
 
diff --git a/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp b/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp
index 764f2d8868..2caa47658a 100644
--- a/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp
@@ -45,7 +45,6 @@
 #include <QtCore/QFile>
 #include <QtCore/QLibraryInfo>
 #include <QtCore/QDir>
-#include <QtCore/QUuid>
 #include <QtCore/QtEndian>
 
 #undef QT_NO_FREETYPE
@@ -93,56 +92,10 @@ QFontEngine *QFreeTypeFontDatabase::fontEngine(const QFontDef &fontDef, void *us
     return QFontEngineFT::create(fontDef, faceId);
 }
 
-namespace {
-
-    class QFontEngineFTRawData: public QFontEngineFT
-    {
-    public:
-        QFontEngineFTRawData(const QFontDef &fontDef) : QFontEngineFT(fontDef)
-        {
-        }
-
-        void updateFamilyNameAndStyle()
-        {
-            fontDef.family = QString::fromLatin1(freetype->face->family_name);
-
-            if (freetype->face->style_flags & FT_STYLE_FLAG_ITALIC)
-                fontDef.style = QFont::StyleItalic;
-
-            if (freetype->face->style_flags & FT_STYLE_FLAG_BOLD)
-                fontDef.weight = QFont::Bold;
-        }
-
-        bool initFromData(const QByteArray &fontData)
-        {
-            FaceId faceId;
-            faceId.filename = "";
-            faceId.index = 0;
-            faceId.uuid = QUuid::createUuid().toByteArray();
-
-            return init(faceId, true, Format_None, fontData);
-        }
-    };
-
-}
-
 QFontEngine *QFreeTypeFontDatabase::fontEngine(const QByteArray &fontData, qreal pixelSize,
                                                 QFont::HintingPreference hintingPreference)
 {
-    QFontDef fontDef;
-    fontDef.pixelSize = pixelSize;
-    fontDef.hintingPreference = hintingPreference;
-
-    QFontEngineFTRawData *fe = new QFontEngineFTRawData(fontDef);
-    if (!fe->initFromData(fontData)) {
-        delete fe;
-        return 0;
-    }
-
-    fe->updateFamilyNameAndStyle();
-    fe->setQtDefaultHintStyle(static_cast<QFont::HintingPreference>(fontDef.hintingPreference));
-
-    return fe;
+    return QFontEngineFT::create(fontData, pixelSize, hintingPreference);
 }
 
 QStringList QFreeTypeFontDatabase::addApplicationFont(const QByteArray &fontData, const QString &fileName)
-- 
cgit v1.2.3