Title: [146334] trunk
- Revision
- 146334
- Author
- commit-qu...@webkit.org
- Date
- 2013-03-20 06:08:38 -0700 (Wed, 20 Mar 2013)
Log Message
Unreviewed, rolling out r146331.
http://trac.webkit.org/changeset/146331
https://bugs.webkit.org/show_bug.cgi?id=112795
Does not work as expected (Requested by carewolf on #webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2013-03-20
Source/WebCore:
* platform/graphics/qt/FontQt.cpp:
(WebCore::Font::initFormatForTextLayout):
LayoutTests:
* platform/qt/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (146333 => 146334)
--- trunk/LayoutTests/ChangeLog 2013-03-20 12:43:13 UTC (rev 146333)
+++ trunk/LayoutTests/ChangeLog 2013-03-20 13:08:38 UTC (rev 146334)
@@ -1,3 +1,13 @@
+2013-03-20 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r146331.
+ http://trac.webkit.org/changeset/146331
+ https://bugs.webkit.org/show_bug.cgi?id=112795
+
+ Does not work as expected (Requested by carewolf on #webkit).
+
+ * platform/qt/TestExpectations:
+
2013-03-20 Allan Sandfeld Jensen <allan.jen...@digia.com>
[Qt] New fast/text/word-space-with-kerning-3.html fails on Qt
Modified: trunk/LayoutTests/platform/qt/TestExpectations (146333 => 146334)
--- trunk/LayoutTests/platform/qt/TestExpectations 2013-03-20 12:43:13 UTC (rev 146333)
+++ trunk/LayoutTests/platform/qt/TestExpectations 2013-03-20 13:08:38 UTC (rev 146334)
@@ -1822,6 +1822,8 @@
# https://bugs.webkit.org/show_bug.cgi?id=80293
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
Modified: trunk/Source/WebCore/ChangeLog (146333 => 146334)
--- trunk/Source/WebCore/ChangeLog 2013-03-20 12:43:13 UTC (rev 146333)
+++ trunk/Source/WebCore/ChangeLog 2013-03-20 13:08:38 UTC (rev 146334)
@@ -1,3 +1,14 @@
+2013-03-20 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r146331.
+ http://trac.webkit.org/changeset/146331
+ https://bugs.webkit.org/show_bug.cgi?id=112795
+
+ Does not work as expected (Requested by carewolf on #webkit).
+
+ * platform/graphics/qt/FontQt.cpp:
+ (WebCore::Font::initFormatForTextLayout):
+
2013-03-20 Eugene Klyuchnikov <eus...@chromium.org>
Web Inspector: [Resources] Local Storage: "Add item" row height doesn't match underlying grid.
Modified: trunk/Source/WebCore/platform/graphics/qt/FontQt.cpp (146333 => 146334)
--- trunk/Source/WebCore/platform/graphics/qt/FontQt.cpp 2013-03-20 12:43:13 UTC (rev 146333)
+++ trunk/Source/WebCore/platform/graphics/qt/FontQt.cpp 2013-03-20 13:08:38 UTC (rev 146334)
@@ -257,9 +257,10 @@
range.format.setFontWordSpacing(m_wordSpacing);
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())
layout->setAdditionalFormats(QList<QTextLayout::FormatRange>() << range);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
