1 files changed, 39 insertions, 16 deletions

diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm
index b3efe6c..ebc1f6d 100644
--- a/src/gui/text/qfontengine_mac.mm
+++ b/src/gui/text/qfontengine_mac.mm
@@ -142,7 +142,7 @@ void qmacfontengine_gamma_correct(QImage *image)
 
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-QCoreTextFontEngineMulti::QCoreTextFontEngineMulti(const ATSFontFamilyRef &, const ATSFontRef &atsFontRef, const QFontDef &fontDef, bool kerning)
+QCoreTextFontEngineMulti::QCoreTextFontEngineMulti(const QCFString &name, const QFontDef &fontDef, bool kerning)
     : QFontEngineMulti(0)
 {
     this->fontDef = fontDef;
@@ -158,9 +158,6 @@ QCoreTextFontEngineMulti::QCoreTextFontEngineMulti(const ATSFontFamilyRef &, con
         break;
     }
 
-    QCFString name;
-    ATSFontGetName(atsFontRef, kATSOptionFlagsDefault, &name);
-
     transform = CGAffineTransformIdentity;
     if (fontDef.stretch != 100) {
         transform = CGAffineTransformMakeScale(float(fontDef.stretch) / float(100), 1);
@@ -421,8 +418,7 @@ QCoreTextFontEngine::QCoreTextFontEngine(CTFontRef font, const QFontDef &def,
     synthesisFlags = 0;
     ctfont = font;
     CFRetain(ctfont);
-    ATSFontRef atsfont = CTFontGetPlatformFont(ctfont, 0);
-    cgFont = CGFontCreateWithPlatformFont(&atsfont);
+    cgFont = CTFontCopyGraphicsFont(ctfont, NULL);
     CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(ctfont);
     if (fontDef.weight >= QFont::Bold && !(traits & kCTFontBoldTrait)) {
          synthesisFlags |= SynthesizedBold;
@@ -442,8 +438,8 @@ QCoreTextFontEngine::QCoreTextFontEngine(CTFontRef font, const QFontDef &def,
 
 QCoreTextFontEngine::~QCoreTextFontEngine()
 {
-    CFRelease(ctfont);
     CFRelease(cgFont);
+    CFRelease(ctfont);
 }
 
 bool QCoreTextFontEngine::stringToCMap(const QChar *, int, QGlyphLayout *, int *, QTextEngine::ShaperFlags) const
@@ -656,7 +652,13 @@ void QCoreTextFontEngine::addGlyphsToPath(glyph_t *glyphs, QFixedPoint *position
     }
 }
 
-QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, int margin, bool aa)
+QFont QCoreTextFontEngine::createExplicitFont() const
+{
+    QString familyName = QCFString::toQString(CTFontCopyFamilyName(ctfont));
+    return createExplicitFontWithName(familyName);
+}
+
+QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, QFixed subPixelPosition, int /*margin*/, bool aa)
 {
     const glyph_metrics_t br = boundingBox(glyph);
     QImage im(qRound(br.width)+2, qRound(br.height)+2, QImage::Format_RGB32);
@@ -689,11 +691,10 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, int margin, bool aa)
     CGContextSetRGBFillColor(ctx, 1, 1, 1, 1);
     CGContextSetTextDrawingMode(ctx, kCGTextFill);
 
-    ATSFontRef atsfont = CTFontGetPlatformFont(ctfont, 0);
-    QCFType<CGFontRef> cgFont = CGFontCreateWithPlatformFont(&atsfont);
     CGContextSetFont(ctx, cgFont);
 
-    qreal pos_x = -br.x.toReal()+1, pos_y = im.height()+br.y.toReal();
+    qreal pos_x = -br.x.toReal() + subPixelPosition.toReal();
+    qreal pos_y = im.height()+br.y.toReal();
     CGContextSetTextPosition(ctx, pos_x, pos_y);
 
     CGSize advance;
@@ -714,7 +715,7 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, int margin, bool aa)
 
 QImage QCoreTextFontEngine::alphaMapForGlyph(glyph_t glyph)
 {
-    QImage im = imageForGlyph(glyph, 0, false);
+    QImage im = imageForGlyph(glyph, QFixed(), 0, false);
 
     QImage indexed(im.width(), im.height(), QImage::Format_Indexed8);
     QVector<QRgb> colors(256);
@@ -735,12 +736,12 @@ QImage QCoreTextFontEngine::alphaMapForGlyph(glyph_t glyph)
     return indexed;
 }
 
-QImage QCoreTextFontEngine::alphaRGBMapForGlyph(glyph_t glyph, int margin, const QTransform &x)
+QImage QCoreTextFontEngine::alphaRGBMapForGlyph(glyph_t glyph, QFixed subPixelPosition, int margin, const QTransform &x)
 {
     if (x.type() >= QTransform::TxScale)
-        return QFontEngine::alphaRGBMapForGlyph(glyph, margin, x);
+        return QFontEngine::alphaRGBMapForGlyph(glyph, subPixelPosition, margin, x);
 
-    QImage im = imageForGlyph(glyph, margin, true);
+    QImage im = imageForGlyph(glyph, subPixelPosition, margin, true);
     qmacfontengine_gamma_correct(&im);
     return im;
 }
@@ -1419,6 +1420,7 @@ static inline unsigned int getChar(const QChar *str, int &i, const int len)
     return uc;
 }
 
+// Not used directly for shaping, only used to calculate m_averageCharWidth
 bool QFontEngineMac::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, QTextEngine::ShaperFlags flags) const
 {
     if (!cmap) {
@@ -1591,6 +1593,27 @@ static void addGlyphsToPathHelper(ATSUStyle style, glyph_t *glyphs, QFixedPoint
     DisposeATSCubicClosePathUPP(closePath);
 }
 
+QFont QFontEngineMac::createExplicitFont() const
+{
+    FMFont fmFont = FMGetFontFromATSFontRef(fontID);
+
+    FMFontFamily fmFamily;
+    FMFontStyle fmStyle;
+    QString familyName;
+    if (!FMGetFontFamilyInstanceFromFont(fmFont, &fmFamily, &fmStyle)) {
+        ATSFontFamilyRef familyRef = FMGetATSFontFamilyRefFromFontFamily(fmFamily);
+        QCFString cfFamilyName;;
+        ATSFontFamilyGetName(familyRef, kATSOptionFlagsDefault, &cfFamilyName);
+        familyName = cfFamilyName;
+    } else {
+        QCFString cfFontName;
+        ATSFontGetName(fontID, kATSOptionFlagsDefault, &cfFontName);
+        familyName = cfFontName;
+    }
+
+    return createExplicitFontWithName(familyName);
+}
+
 void QFontEngineMac::addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int numGlyphs, QPainterPath *path,
                                            QTextItem::RenderFlags)
 {
@@ -1677,7 +1700,7 @@ QImage QFontEngineMac::alphaMapForGlyph(glyph_t glyph)
     return indexed;
 }
 
-QImage QFontEngineMac::alphaRGBMapForGlyph(glyph_t glyph, int margin, const QTransform &t)
+QImage QFontEngineMac::alphaRGBMapForGlyph(glyph_t glyph, QFixed, int margin, const QTransform &t)
 {
     QImage im = imageForGlyph(glyph, margin, true);