Changeset 57516 in webkit

Timestamp:

Apr 13, 2010 8:21:36 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-13 Eskil Blomfeldt <​eblomfel@trolltech.com>, Jesus Sanchez-Palencia <​jesus.palencia@openbossa.org>

Reviewed by Simon Hausmann.

[Qt] Use integer pixel metric QFont API to fix rounding errors in text rendering on the Mac
​https://bugs.webkit.org/show_bug.cgi?id=36532

• platform/graphics/qt/FontQt.cpp: (WebCore::Font::floatWidthForComplexText): (WebCore::Font::font):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/FontQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-13  Eskil Blomfeldt <eblomfel@trolltech.com>, Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Use integer pixel metric QFont API to fix rounding errors in text rendering on the Mac
+        https://bugs.webkit.org/show_bug.cgi?id=36532
+
+        * platform/graphics/qt/FontQt.cpp:
+        (WebCore::Font::floatWidthForComplexText):
+        (WebCore::Font::font):
+
 2010-04-13  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/platform/graphics/qt/FontQt.cpp

@@ -183 +183 @@
     QTextLayout layout(string, font());
     QTextLine line = setupLayout(&layout, run);
+#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
+    int w = int(line.horizontalAdvance());
+#else
     int w = int(line.naturalTextWidth());
+#endif
     // WebKit expects us to ignore word spacing on the first character (as opposed to what Qt does)
     if (treatAsSpace(run[0]))
@@ -224 +228 @@
     if (m_wordSpacing != 0)
         f.setWordSpacing(m_wordSpacing);
+
+#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
+    f.setStyleStrategy(QFont::ForceIntegerMetrics);
+#endif
+
     return f;
 }