Attachment 359677 Details for Bug 193395 – Patch

[patch] Patch

wpe-simple-text.diff (text/plain), 4.98 KB, created by Carlos Garcia Campos on 2019-01-21 01:19:36 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-01-21 01:19:36 PST

Size: 4.98 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 9cf7f915053..733d30a218a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2019-01-21  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        REGRESSION(r239915): about 130 test failures on WPE
>+        https://bugs.webkit.org/show_bug.cgi?id=193395
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Since r239915 we are only overriding the characters with Default_Ignorable unicode property when the font
>+        doesn't support the code point. If the font happens to provide a glyph for the character, it's later ignored by
>+        harfbuzz when shaping, but the simple text code path doesn't ignore them unless there isn't a glyph.
>+
>+        * platform/graphics/WidthIterator.cpp:
>+        (WebCore::WidthIterator::advanceInternal): Always ignore characters with Default_Ignorable unicode property.
>+        (WebCore::characterMustDrawSomething): Moved to CharacterProperties.h and renamed as isDefaultIgnorableCodePoint().
>+        * platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp:
>+        (WebCore::GlyphPage::fill): Use isDefaultIgnorableCodePoint().
>+        * platform/text/CharacterProperties.h:
>+        (WebCore::isDefaultIgnorableCodePoint): Return whether the character has Default_Ignorable unicode property.
>+
> 2019-01-20  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         [WHLSL] Implement Metal code generation
>diff --git a/Source/WebCore/platform/graphics/WidthIterator.cpp b/Source/WebCore/platform/graphics/WidthIterator.cpp
>index 9bde879703f..2c6d9514436 100644
>--- a/Source/WebCore/platform/graphics/WidthIterator.cpp
>+++ b/Source/WebCore/platform/graphics/WidthIterator.cpp
>@@ -22,6 +22,7 @@
> #include "config.h"
> #include "WidthIterator.h"
> 
>+#include "CharacterProperties.h"
> #include "Font.h"
> #include "FontCascade.h"
> #include "GlyphBuffer.h"
>@@ -165,11 +166,6 @@ static inline std::pair<bool, bool> expansionLocation(bool ideograph, bool treat
>     return std::make_pair(expandLeft, expandRight);
> }
> 
>-static inline bool characterMustDrawSomething(UChar32 character)
>-{
>-    return !u_hasBinaryProperty(character, UCHAR_DEFAULT_IGNORABLE_CODE_POINT);
>-}
>-
> template <typename TextIterator>
> inline unsigned WidthIterator::advanceInternal(TextIterator& textIterator, GlyphBuffer* glyphBuffer)
> {
>@@ -201,10 +197,19 @@ inline unsigned WidthIterator::advanceInternal(TextIterator& textIterator, Glyph
>     // We are iterating in string order, not glyph order. Compare this to ComplexTextController::adjustGlyphsAndAdvances()
>     while (textIterator.consume(character, clusterLength)) {
>         unsigned advanceLength = clusterLength;
>+        bool characterMustDrawSomething = !isDefaultIgnorableCodePoint(character);
>+#if USE(FREETYPE)
>+        // Freetype based ports only override the characters with Default_Ignorable unicode property when the font
>+        // doesn't support the code point. We should ignore them at this point to ensure they are not displayed.
>+        if (!characterMustDrawSomething) {
>+            textIterator.advance(advanceLength);
>+            continue;
>+        }
>+#endif
>         int currentCharacter = textIterator.currentIndex();
>         const GlyphData& glyphData = m_font->glyphDataForCharacter(character, rtl);
>         Glyph glyph = glyphData.glyph;
>-        if (!glyph && !characterMustDrawSomething(character)) {
>+        if (!glyph && !characterMustDrawSomething) {
>             textIterator.advance(advanceLength);
>             continue;
>         }
>diff --git a/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp b/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
>index 7c01975ed29..1e85866876f 100644
>--- a/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
>+++ b/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
>@@ -32,6 +32,7 @@
> #include "GlyphPage.h"
> 
> #include "CairoUtilities.h"
>+#include "CharacterProperties.h"
> #include "Font.h"
> #include "FontCascade.h"
> #include "UTF16UChar32Iterator.h"
>@@ -70,7 +71,7 @@ bool GlyphPage::fill(UChar* buffer, unsigned bufferLength)
> 
>         Glyph glyph = FcFreeTypeCharIndex(face, FontCascade::treatAsSpace(character) ? space : character);
>         // If the font doesn't support a Default_Ignorable character, replace it with zero with space.
>-        if (!glyph && u_hasBinaryProperty(character, UCHAR_DEFAULT_IGNORABLE_CODE_POINT))
>+        if (!glyph && isDefaultIgnorableCodePoint(character))
>             glyph = zeroWidthSpaceGlyph();
> 
>         if (!glyph)
>diff --git a/Source/WebCore/platform/text/CharacterProperties.h b/Source/WebCore/platform/text/CharacterProperties.h
>index e20d680137c..c3a10d84179 100644
>--- a/Source/WebCore/platform/text/CharacterProperties.h
>+++ b/Source/WebCore/platform/text/CharacterProperties.h
>@@ -106,4 +106,9 @@ inline bool isEmojiModifierBase(UChar32 character)
> #endif
> }
> 
>+inline bool isDefaultIgnorableCodePoint(UChar32 character)
>+{
>+    return u_hasBinaryProperty(character, UCHAR_DEFAULT_IGNORABLE_CODE_POINT);
>+}
>+
> }

Flags:

zan: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193395: 359029 | 359031 | 359032 | 359033 | 359677