Changeset 132205 in webkit

Timestamp:

Oct 23, 2012 5:10:10 AM (12 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt] REGRESSION (r130851): fast/text/word-space-with-kerning.html fails
​https://bugs.webkit.org/show_bug.cgi?id=98876

Reviewed by Simon Hausmann.

Source/WebCore:

Do not add word-spacing for leading space. This matches what simple path font-width does.

Tested by existing tests.

• platform/graphics/qt/FontQt.cpp:

(WebCore::Font::floatWidthForComplexText):

LayoutTests:

Unskip passing word-width tests.

• platform/qt/TestExpectations:

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-23  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] REGRESSION (r130851): fast/text/word-space-with-kerning.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=98876
+
+        Reviewed by Simon Hausmann.
+
+        Unskip passing word-width tests.
+
+        * platform/qt/TestExpectations:
+
 2012-10-23  Dongwoo Joshua Im  <dw.im@samsung.com>
 

trunk/LayoutTests/platform/qt/TestExpectations

@@ -1748 +1748 @@
 fast/text/wide-zero-width-space.html
 fast/text/word-break-soft-hyphen.html
-fast/text/word-space.html
 
 # ------- failures due to missing support for particular XSLT features
@@ -1867 +1866 @@
 # https://bugs.webkit.org/show_bug.cgi?id=98751
 fast/xmlhttprequest/xmlhttprequest-nonexistent-file.html
-
-# [Qt] REGRESSION (r130851): fast/text/word-space-with-kerning.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=98876
-fast/text/word-space-with-kerning.html
 
 # ============================================================================= #

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-23  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] REGRESSION (r130851): fast/text/word-space-with-kerning.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=98876
+
+        Reviewed by Simon Hausmann.
+
+        Do not add word-spacing for leading space. This matches what simple path font-width does.
+
+        Tested by existing tests.
+
+        * platform/graphics/qt/FontQt.cpp:
+        (WebCore::Font::floatWidthForComplexText):
+
 2012-10-23  Alexander Pavlov  <apavlov@chromium.org>
 

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

@@ -211 +211 @@
     float x1 = line.cursorToX(0);
     float x2 = line.cursorToX(run.length());
-    const float width = qAbs(x2 - x1);
+    float width = qAbs(x2 - x1);
+    // RenderBlockLineLayout expects us to only add word-spacing for trailing spaces, not for leading spaces.
+    if (treatAsSpace(run[0]))
+        width -= m_wordSpacing;
 
     return width + run.expansion();