Changeset 147544 in webkit

Timestamp:

Apr 3, 2013 5:35:36 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt] Monospace font does not render in proper sizes
​https://bugs.webkit.org/show_bug.cgi?id=93263

Reviewed by Jocelyn Turcotte.

Remove this patch's artificial dependency on Qt 5.1.

• platform/graphics/qt/FontPlatformDataQt.cpp:

(WebCore::FontPlatformData::FontPlatformData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/FontPlatformDataQt.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-03  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] Monospace font does not render in proper sizes
+        https://bugs.webkit.org/show_bug.cgi?id=93263
+
+        Reviewed by Jocelyn Turcotte.
+
+        Remove this patch's artificial dependency on Qt 5.1.
+
+        * platform/graphics/qt/FontPlatformDataQt.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+
 2013-04-03  Takeshi Yoshino  <tyoshino@chromium.org>
 

trunk/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp

@@ -74 +74 @@
     font.setWordSpacing(wordSpacing);
     font.setLetterSpacing(QFont::AbsoluteSpacing, letterSpacing);
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-    // To maintain stable baselines for Qt 5.0, keep force integer metrics enabled and ignore font-smoothing setting.
-    font.setStyleStrategy(QFont::ForceIntegerMetrics);
-#else
+#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
     if (description.fontSmoothing() == NoSmoothing
         || (description.fontSmoothing() == AutoSmoothing && !Font::shouldUseSmoothing()))