Changeset 146331 in webkit

Timestamp:

Mar 20, 2013 4:53:52 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt] New fast/text/word-space-with-kerning-3.html fails on Qt
​https://bugs.webkit.org/show_bug.cgi?id=112668

Reviewed by Jocelyn Turcotte.

Source/WebCore:

Kerning is on by default in Qt. This means we need to disable it
when WebCore does not request it.

• platform/graphics/qt/FontQt.cpp:

(WebCore::Font::initFormatForTextLayout):

LayoutTests:

• platform/qt/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/qt/FontQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-20  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] New fast/text/word-space-with-kerning-3.html fails on Qt
+        https://bugs.webkit.org/show_bug.cgi?id=112668
+
+        Reviewed by Jocelyn Turcotte.
+
+        * platform/qt/TestExpectations:
+
 2013-03-20  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/LayoutTests/platform/qt/TestExpectations

@@ -1823 +1823 @@
 fast/text/international/spaces-combined-in-vertical-text.html
 
-webkit.org/b/112668 fast/text/word-space-with-kerning-3.html [ Skip ]
-
 fast/writing-mode/border-styles-vertical-lr.html
 fast/writing-mode/border-styles-vertical-rl.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-20  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] New fast/text/word-space-with-kerning-3.html fails on Qt
+        https://bugs.webkit.org/show_bug.cgi?id=112668
+
+        Reviewed by Jocelyn Turcotte.
+
+        Kerning is on by default in Qt. This means we need to disable it
+        when WebCore does not request it.
+
+        * platform/graphics/qt/FontQt.cpp:
+        (WebCore::Font::initFormatForTextLayout):
+
 2013-03-20  Ilya Tikhonovsky  <loislo@chromium.org>
 

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

@@ -258 +258 @@
     if (m_letterSpacing)
         range.format.setFontLetterSpacing(m_letterSpacing);
-    if (typesettingFeatures() & Kerning)
-        range.format.setFontKerning(true);
     if (isSmallCaps())
         range.format.setFontCapitalization(QFont::SmallCaps);
+    range.format.setFontKerning(typesettingFeatures() & Kerning);
 
     if (range.format.propertyCount())