1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QCoreTextFontEngine: Cache face_id.

Browse Source 
This involves a significant amount of memory allocation, which made it rather
more expensive than one would expect. The FT engine also caches face id, so this
seems like a reasonable prospect.

Increases delegates_text by another few ops/frame.

Change-Id: If31e6b54478e4caf46a3a12a9ac45254a1f01525
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
This commit is contained in:
Robin Burchell 2015-02-13 22:20:12 +01:00 committed by Konstantin Ritt
parent 878cbbcb65
commit 571908f7fc
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
View File

@ -162,6 +162,10 @@ void QCoreTextFontEngine::init()
Q_ASSERT(ctfont != NULL); Q_ASSERT(ctfont != NULL);
Q_ASSERT(cgFont != NULL); Q_ASSERT(cgFont != NULL);
face_id.index = 0;
QCFString name = CTFontCopyName(ctfont, kCTFontUniqueNameKey);
face_id.filename = QCFString::toQString(name).toUtf8();
QCFString family = CTFontCopyFamilyName(ctfont); QCFString family = CTFontCopyFamilyName(ctfont);
fontDef.family = family; fontDef.family = family;
@ -696,13 +700,7 @@ void QCoreTextFontEngine::recalcAdvances(QGlyphLayout *glyphs, QFontEngine::Shap
QFontEngine::FaceId QCoreTextFontEngine::faceId() const QFontEngine::FaceId QCoreTextFontEngine::faceId() const
{ {
FaceId result; return face_id;
result.index = 0;
QCFString name = CTFontCopyName(ctfont, kCTFontUniqueNameKey);
result.filename = QCFString::toQString(name).toUtf8();
return result;
} }
bool QCoreTextFontEngine::canRender(const QChar *string, int len) const bool QCoreTextFontEngine::canRender(const QChar *string, int len) const

1
src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
View File

@ -135,6 +135,7 @@ private:
int synthesisFlags; int synthesisFlags;
CGAffineTransform transform; CGAffineTransform transform;
QFixed avgCharWidth; QFixed avgCharWidth;
QFontEngine::FaceId face_id;
}; };
CGAffineTransform qt_transform_from_fontdef(const QFontDef &fontDef); CGAffineTransform qt_transform_from_fontdef(const QFontDef &fontDef);