diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2012-03-01 14:43:44 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-01 16:15:00 +0100 |
| commit | 578246675de63a15838528db702088074bed4a31 (patch) | |
| tree | bbdbad21d13913b75f4d60662d017112dc90c843 /src/gui/text | |
| parent | 83493be5fc4387e81e4475856f2493dd02a9039a (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 5ffac0cfc732b994e60af0b6b965b1780ca41f2e.
Change-Id: I072bd817e20cf2f3455b6799d68079100e1a49dd
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/text')
| -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 c53e2580d2..0fd1848ddf 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -879,7 +879,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->outline_drawing || fetchMetricsOnly) + if (set->outline_drawing && fetchMetricsOnly) return 0; FT_GlyphSlot slot = face->glyph; |