Attachment 358697 Details for Bug 193279 – Patch

[patch] Patch

wc-complex-nbsp.diff (text/plain), 1.71 KB, created by Carlos Garcia Campos on 2019-01-09 05:28:21 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-01-09 05:28:21 PST

Size: 1.71 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d1d06c556ee..fa175444330 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-01-09  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 NOBODY (OOPS!).
>+
>+        The fix applied in r135884 to WidthIterator should also be applied to ComplexTextController.
>+
>+        * platform/graphics/ComplexTextController.cpp:
>+        (WebCore::ComplexTextController::adjustGlyphsAndAdvances):
>+
> 2019-01-09  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         REGRESSION(r239156): [FreeType] fixed width, and synthetic bold/italic not correctly applied since r239156
>diff --git a/Source/WebCore/platform/graphics/ComplexTextController.cpp b/Source/WebCore/platform/graphics/ComplexTextController.cpp
>index 9a9c9768612..c4d072b5193 100644
>--- a/Source/WebCore/platform/graphics/ComplexTextController.cpp
>+++ b/Source/WebCore/platform/graphics/ComplexTextController.cpp
>@@ -804,7 +804,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;

Flags:

mcatanzaro: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193279: 358697