ComplexText: Test fast/text/word-space-nbsp.html fails when using complex text path
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Feb 2019 14:33:15 +0000 (14:33 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Feb 2019 14:33:15 +0000 (14:33 +0000)
https://bugs.webkit.org/show_bug.cgi?id=193279

Reviewed by Michael Catanzaro.

Source/WebCore:

The fix applied in r135884 to WidthIterator should also be applied to ComplexTextController.

* platform/graphics/ComplexTextController.cpp:
(WebCore::ComplexTextController::adjustGlyphsAndAdvances):

LayoutTests:

Remove test expectation.

* platform/gtk/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240846 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/gtk/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/ComplexTextController.cpp

index 0869b07..b8339c2 100644 (file)
@@ -1,5 +1,16 @@
 2019-02-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 
+        ComplexText: Test fast/text/word-space-nbsp.html fails when using complex text path
+        https://bugs.webkit.org/show_bug.cgi?id=193279
+
+        Reviewed by Michael Catanzaro.
+
+        Remove test expectation.
+
+        * platform/gtk/TestExpectations:
+
+2019-02-01  Carlos Garcia Campos  <cgarcia@igalia.com>
+
         Unreviewed WPE gardening. Remove duplicated expectations.
 
         Remove the platform specific expectations that match the generic ones.
index af3749a..eb9863b 100644 (file)
@@ -3681,7 +3681,6 @@ webkit.org/b/193627 editing/spelling/spelling-dots-position.html [ ImageOnlyFail
 
 webkit.org/b/193628 fast/css/content-counter-010.htm [ ImageOnlyFailure ]
 webkit.org/b/193628 fast/text/kerning-with-TextLayout.html [ ImageOnlyFailure ]
-webkit.org/b/193628 fast/text/word-space-nbsp.html [ ImageOnlyFailure ]
 webkit.org/b/193628 imported/blink/fast/text/international/text-shaping-arabic.html [ ImageOnlyFailure ]
 webkit.org/b/193628 imported/blink/fast/text/wide-preformatted.html [ ImageOnlyFailure ]
 webkit.org/b/193628 imported/blink/fast/text/word-spacing-nbsp.html [ ImageOnlyFailure ]
index ae47c57..39db46b 100644 (file)
@@ -1,3 +1,15 @@
+2019-02-01  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        ComplexText: Test fast/text/word-space-nbsp.html fails when using complex text path
+        https://bugs.webkit.org/show_bug.cgi?id=193279
+
+        Reviewed by Michael Catanzaro.
+
+        The fix applied in r135884 to WidthIterator should also be applied to ComplexTextController.
+
+        * platform/graphics/ComplexTextController.cpp:
+        (WebCore::ComplexTextController::adjustGlyphsAndAdvances):
+
 2019-02-01  Zalan Bujtas  <zalan@apple.com>
 
         [LFC] Adjust replaced element's intrinsic ratio
index cbe32b9..7424d4f 100644 (file)
@@ -810,7 +810,7 @@ void ComplexTextController::adjustGlyphsAndAdvances()
                         afterExpansion = false;
 
                     // Account for word-spacing.
-                    if (treatAsSpace && (ch != '\t' || !m_run.allowTabs()) && (characterIndex > 0 || runIndex > 0) && m_font.wordSpacing())
+                    if (treatAsSpace && (ch != '\t' || !m_run.allowTabs()) && (characterIndex > 0 || runIndex > 0 || ch == noBreakSpace) && m_font.wordSpacing())
                         advance.expand(m_font.wordSpacing(), 0);
                 } else
                     afterExpansion = false;