Changeset 147932 in webkit

Timestamp:

Apr 8, 2013 10:46:55 AM (11 years ago)

Author:

jocelyn.turcotte@digia.com

Message:

[Qt] Avoid "QFont::setPixelSize: Pixel size <= 0 (0)"
​https://bugs.webkit.org/show_bug.cgi?id=114175

Reviewed by Allan Sandfeld Jensen.

QFont doesn't support a 0-size but WebCore does.
Leave our QFont in its default state in this case to avoid the warning.

• 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-08  Jocelyn Turcotte  <jocelyn.turcotte@digia.com>
+
+        [Qt] Avoid "QFont::setPixelSize: Pixel size <= 0 (0)"
+        https://bugs.webkit.org/show_bug.cgi?id=114175
+
+        Reviewed by Allan Sandfeld Jensen.
+
+        QFont doesn't support a 0-size but WebCore does.
+        Leave our QFont in its default state in this case to avoid the warning.
+
+        * platform/graphics/qt/FontPlatformDataQt.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+
 2013-04-08  Yi Shen  <max.hong.shen@gmail.com>
 

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

@@ -69 +69 @@
     int requestedSize = description.computedPixelSize();
     font.setFamily(familyName);
-    font.setPixelSize(requestedSize);
+    if (requestedSize)
+        font.setPixelSize(requestedSize);
     font.setItalic(description.italic());
     font.setWeight(toQFontWeight(description.weight()));