diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2012-03-01 14:40:21 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-01 16:43:37 +0100 |
| commit | 933e35ae7e8548ad27c9e85ebfe95ae3eca26619 (patch) | |
| tree | 69d290584115752385b9209da264ed96c1c7e423 /src/gui | |
| parent | d9649812521e9c67cebb2f9a932e853d5333b2b1 (diff) | |
Revert "Don't render glyph with FT with fetchMetricsOnly"
Report https://bugs.webkit.org/show_bug.cgi?id=79561 shows that
this commit will cause significant slow down in text handling
operations. Though the exact reason is unknown we should revert
it first and find out the reason later.
This reverts commit 692064bcfd116c2f3a2b30572e511ee68c6a0531.
Change-Id: I16a56c3093bdfa2119ab6a6e9049ef2925468e29
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 14e2dba364..8880eb7cb3 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -877,7 +877,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph, if (err != FT_Err_Ok) qWarning("load glyph failed err=%x face=%p, glyph=%d", err, face, glyph); - if (!set || set->outline_drawing || fetchMetricsOnly) + if ((!set || set->outline_drawing) && fetchMetricsOnly) return 0; FT_GlyphSlot slot = face->glyph; |