Changeset 222605 in webkit

Timestamp:

Sep 27, 2017 11:57:08 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[REGRESSION] word-spacing property is incorrectly applied
​https://bugs.webkit.org/show_bug.cgi?id=142086
<rdar://problem/19985240>

Patch by Fujii Hironori <Fujii Hironori> on 2017-09-27
Reviewed by Zalan Bujtas.

Source/WebCore:

word-spacing property isn't applied to text nodes with starting
with '\n' if the kerning enabled. In Bug 165796, only ' ' and '\t'
are treated for word-spacing, but '\n'. It should be treated as
well.

Test: fast/text/word-space-between-inlines.html

• rendering/RenderBlockLineLayout.cpp:

(WebCore::setLogicalWidthForTextRun): Use
FontCascade::treatAsSpace() instead of checking explicitly by
comparing with ' ' and '\t'.

LayoutTests:

• platform/gtk/TestExpectations: Unmark

fast/text/word-space-between-inlines.html

• platform/mac/TestExpectations: Unmark

fast/css/word-spacing-between-blocks.html,
fast/css/word-spacing-between-inlines.html,
fast/css/word-spacing-characters.html and
fast/text/word-space-between-inlines.html.

• platform/gtk/fast/css/word-space-extra-expected.txt:

Rebaselined.

• platform/mac/fast/css/word-space-extra-expected.png: Ditto.
• platform/mac/fast/css/word-space-extra-expected.txt: Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• LayoutTests/platform/gtk/fast/css/word-space-extra-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/fast/css/word-space-extra-expected.png (modified) (previous)
• LayoutTests/platform/mac/fast/css/word-space-extra-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-09-27  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [REGRESSION] word-spacing property is incorrectly applied
+        https://bugs.webkit.org/show_bug.cgi?id=142086
+        <rdar://problem/19985240>
+
+        Reviewed by Zalan Bujtas.
+
+        * platform/gtk/TestExpectations: Unmark
+        fast/text/word-space-between-inlines.html
+        * platform/mac/TestExpectations: Unmark
+        fast/css/word-spacing-between-blocks.html,
+        fast/css/word-spacing-between-inlines.html,
+        fast/css/word-spacing-characters.html and
+        fast/text/word-space-between-inlines.html.
+        * platform/gtk/fast/css/word-space-extra-expected.txt:
+        Rebaselined.
+        * platform/mac/fast/css/word-space-extra-expected.png: Ditto.
+        * platform/mac/fast/css/word-space-extra-expected.txt: Ditto.
+
 2017-09-27  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -3439 +3439 @@
 
 webkit.org/b/177364 fast/text/international/iso-8859-8.html [ Failure ]
-webkit.org/b/177364 fast/text/word-space-between-inlines.html [ ImageOnlyFailure ]
 
 webkit.org/b/175661 inspector/worker/resources-in-worker.html [ Failure ]

trunk/LayoutTests/platform/gtk/fast/css/word-space-extra-expected.txt

@@ -442 +442 @@
           RenderText {#text} at (513,198) size 772x35
             text run at (513,198) width 259: ". (with monospace font from"
-            text run at (0,216) width 144: "elements to too) "
+            text run at (0,216) width 164: "elements to too) "
         RenderText {#text} at (0,0) size 0x0
         RenderBR {BR} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1029 +1029 @@
 # SVG gradients are not bit-for-bit equivalent through a scale.
 webkit.org/b/142192 svg/transforms/transformed-text-fill-gradient.html [ ImageOnlyFailure ]
-
-# Word-spacing is incorrectly applied
-webkit.org/b/142086 fast/css/word-spacing-between-blocks.html [ ImageOnlyFailure ]
-webkit.org/b/142086 fast/css/word-spacing-between-inlines.html [ ImageOnlyFailure ]
-webkit.org/b/142086 fast/css/word-spacing-characters.html [ ImageOnlyFailure ]
-webkit.org/b/142086 fast/text/word-space-between-inlines.html [ ImageOnlyFailure ]
 
 # Underlines' starting and ending positions need to be pixel-snapped

trunk/LayoutTests/platform/mac/fast/css/word-space-extra-expected.txt

@@ -442 +442 @@
           RenderText {#text} at (512,198) size 776x36
             text run at (512,198) width 264: ". (with monospace font from"
-            text run at (0,216) width 148: "elements to too) "
+            text run at (0,216) width 168: "elements to too) "
         RenderText {#text} at (0,0) size 0x0
         RenderBR {BR} at (0,0) size 0x0

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-09-27  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [REGRESSION] word-spacing property is incorrectly applied
+        https://bugs.webkit.org/show_bug.cgi?id=142086
+        <rdar://problem/19985240>
+
+        Reviewed by Zalan Bujtas.
+
+        word-spacing property isn't applied to text nodes with starting
+        with '\n' if the kerning enabled. In Bug 165796, only ' ' and '\t'
+        are treated for word-spacing, but '\n'. It should be treated as
+        well.
+
+        Test: fast/text/word-space-between-inlines.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::setLogicalWidthForTextRun): Use
+        FontCascade::treatAsSpace() instead of checking explicitly by
+        comparing with ' ' and '\t'.
+
 2017-09-27  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -505 +505 @@
                 UChar c = renderer.characterAt(wordMeasurement.startOffset);
                 // renderer.width() omits word-spacing value for leading whitespace, so let's just add it back here.
-                if (!atFirstWordMeasurement && (c == ' ' || c == '\t'))
+                if (!atFirstWordMeasurement && FontCascade::treatAsSpace(c))
                     measuredWidth += renderer.style().fontCascade().wordSpacing();
             } else