From 61a94d2d046c1448ba4c66dfc8e0246286bab14c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Sat, 24 Nov 2018 23:42:32 +0100
Subject: CoreText: Share code by using delegate constructor

Change-Id: If3d5d533f98552335517ef61cb748d0117fe3053
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 .../fontdatabases/mac/qfontengine_coretext.mm             | 15 +++++++++------
 .../fontdatabases/mac/qfontengine_coretext_p.h            |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
index a58ea71b19..b5e4359caf 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
@@ -190,10 +190,8 @@ QCoreTextFontEngine *QCoreTextFontEngine::create(const QByteArray &fontData, qre
 }
 
 QCoreTextFontEngine::QCoreTextFontEngine(CTFontRef font, const QFontDef &def)
-    : QFontEngine(Mac)
+    : QCoreTextFontEngine(def)
 {
-    fontDef = def;
-    transform = qt_transform_from_fontdef(fontDef);
     ctfont = font;
     CFRetain(ctfont);
     cgFont = CTFontCopyGraphicsFont(font, NULL);
@@ -201,10 +199,8 @@ QCoreTextFontEngine::QCoreTextFontEngine(CTFontRef font, const QFontDef &def)
 }
 
 QCoreTextFontEngine::QCoreTextFontEngine(CGFontRef font, const QFontDef &def)
-    : QFontEngine(Mac)
+    : QCoreTextFontEngine(def)
 {
-    fontDef = def;
-    transform = qt_transform_from_fontdef(fontDef);
     cgFont = font;
     // Keep reference count balanced
     CFRetain(cgFont);
@@ -212,6 +208,13 @@ QCoreTextFontEngine::QCoreTextFontEngine(CGFontRef font, const QFontDef &def)
     init();
 }
 
+QCoreTextFontEngine::QCoreTextFontEngine(const QFontDef &def)
+    : QFontEngine(Mac)
+{
+    fontDef = def;
+    transform = qt_transform_from_fontdef(fontDef);
+}
+
 QCoreTextFontEngine::~QCoreTextFontEngine()
 {
     CFRelease(cgFont);
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
index f4213a2ffa..33c3c0cd40 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
@@ -126,6 +126,7 @@ public:
 
     static QCoreTextFontEngine *create(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference);
 protected:
+    QCoreTextFontEngine(const QFontDef &def);
     void init();
     QImage imageForGlyph(glyph_t glyph, QFixed subPixelPosition, bool colorful, const QTransform &m);
     void loadAdvancesForGlyphs(QVarLengthArray<CGGlyph> &cgGlyphs, QGlyphLayout *glyphs) const;
-- 
cgit v1.2.3