Title: [240848] trunk
Revision
240848
Author
[email protected]
Date
2019-02-01 06:36:31 -0800 (Fri, 01 Feb 2019)

Log Message

REGRESSION(r239915): css3/font-feature-font-face-local.html failing on WPE
https://bugs.webkit.org/show_bug.cgi?id=194008

Reviewed by Žan Doberšek.

Source/WebCore:

We need to replace control characters with zero width space too.

* platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp:
(WebCore::GlyphPage::fill):
* platform/text/CharacterProperties.h:
(WebCore::isControlCharacter):

LayoutTests:

Remove test expectation.

* platform/wpe/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (240847 => 240848)


--- trunk/LayoutTests/ChangeLog	2019-02-01 14:35:08 UTC (rev 240847)
+++ trunk/LayoutTests/ChangeLog	2019-02-01 14:36:31 UTC (rev 240848)
@@ -1,5 +1,16 @@
 2019-02-01  Carlos Garcia Campos  <[email protected]>
 
+        REGRESSION(r239915): css3/font-feature-font-face-local.html failing on WPE
+        https://bugs.webkit.org/show_bug.cgi?id=194008
+
+        Reviewed by Žan Doberšek.
+
+        Remove test expectation.
+
+        * platform/wpe/TestExpectations:
+
+2019-02-01  Carlos Garcia Campos  <[email protected]>
+
         [WPE] Enable font variations
         https://bugs.webkit.org/show_bug.cgi?id=194148
 

Modified: trunk/LayoutTests/platform/wpe/TestExpectations (240847 => 240848)


--- trunk/LayoutTests/platform/wpe/TestExpectations	2019-02-01 14:35:08 UTC (rev 240847)
+++ trunk/LayoutTests/platform/wpe/TestExpectations	2019-02-01 14:36:31 UTC (rev 240848)
@@ -1547,8 +1547,6 @@
 
 webkit.org/b/193518 imported/w3c/web-platform-tests/fetch/range/general.window.html [ Failure ]
 
-webkit.org/b/194008 css3/font-feature-font-face-local.html [ ImageOnlyFailure ]
-
 webkit.org/b/194009 fast/css/has-attachment.html [ Failure ]
 
 webkit.org/b/193629 fast/css3-text/css3-text-decoration/text-underline-style.html [ ImageOnlyFailure ]

Modified: trunk/Source/WebCore/ChangeLog (240847 => 240848)


--- trunk/Source/WebCore/ChangeLog	2019-02-01 14:35:08 UTC (rev 240847)
+++ trunk/Source/WebCore/ChangeLog	2019-02-01 14:36:31 UTC (rev 240848)
@@ -1,5 +1,19 @@
 2019-02-01  Carlos Garcia Campos  <[email protected]>
 
+        REGRESSION(r239915): css3/font-feature-font-face-local.html failing on WPE
+        https://bugs.webkit.org/show_bug.cgi?id=194008
+
+        Reviewed by Žan Doberšek.
+
+        We need to replace control characters with zero width space too.
+
+        * platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp:
+        (WebCore::GlyphPage::fill):
+        * platform/text/CharacterProperties.h:
+        (WebCore::isControlCharacter):
+
+2019-02-01  Carlos Garcia Campos  <[email protected]>
+
         ComplexText: Test fast/text/word-space-nbsp.html fails when using complex text path
         https://bugs.webkit.org/show_bug.cgi?id=193279
 

Modified: trunk/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp (240847 => 240848)


--- trunk/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp	2019-02-01 14:35:08 UTC (rev 240847)
+++ trunk/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp	2019-02-01 14:36:31 UTC (rev 240848)
@@ -71,7 +71,7 @@
 
         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 && isDefaultIgnorableCodePoint(character))
+        if (!glyph && (isDefaultIgnorableCodePoint(character) || isControlCharacter(character)))
             glyph = zeroWidthSpaceGlyph();
 
         if (!glyph)

Modified: trunk/Source/WebCore/platform/text/CharacterProperties.h (240847 => 240848)


--- trunk/Source/WebCore/platform/text/CharacterProperties.h	2019-02-01 14:35:08 UTC (rev 240847)
+++ trunk/Source/WebCore/platform/text/CharacterProperties.h	2019-02-01 14:36:31 UTC (rev 240848)
@@ -111,4 +111,9 @@
     return u_hasBinaryProperty(character, UCHAR_DEFAULT_IGNORABLE_CODE_POINT);
 }
 
+inline bool isControlCharacter(UChar32 character)
+{
+    return u_getIntPropertyValue(character, UCHAR_GENERAL_CATEGORY) == U_CONTROL_CHAR;
 }
+
+}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to