Changeset 267880 in webkit

Timestamp:

Oct 2, 2020, 8:45:17 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Do not use simplified text measuring when soft hyphen is present
​https://bugs.webkit.org/show_bug.cgi?id=217224

Reviewed by Antti Koivisto.

Specifically the monospaced fast codepath computes incorrect widht value when soft hyphens are present.

• layout/layouttree/LayoutTreeBuilder.cpp:

(WebCore::Layout::canUseSimplifiedTextMeasuring):

• rendering/RenderText.cpp:

(WebCore::RenderText::computeCanUseSimplifiedTextMeasuring const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/layouttree/LayoutTreeBuilder.cpp (modified) (1 diff)
• rendering/RenderText.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-02  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Do not use simplified text measuring when soft hyphen is present
+        https://bugs.webkit.org/show_bug.cgi?id=217224
+
+        Reviewed by Antti Koivisto.
+
+        Specifically the monospaced fast codepath computes incorrect widht value when soft hyphens are present.
+
+        * layout/layouttree/LayoutTreeBuilder.cpp:
+        (WebCore::Layout::canUseSimplifiedTextMeasuring):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::computeCanUseSimplifiedTextMeasuring const):
+
 2020-10-02  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp

@@ -107 +107 @@
 
     for (unsigned i = 0; i < content.length(); ++i) {
-        if ((!whitespaceIsCollapsed && content[i] == '\t') || content[i] == noBreakSpace || content[i] >= HiraganaLetterSmallA)
+        if ((!whitespaceIsCollapsed && content[i] == '\t') || content[i] == noBreakSpace || content[i] == softHyphen || content[i] >= HiraganaLetterSmallA)
             return false;
     }

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -1215 +1215 @@
     auto whitespaceIsCollapsed = style().collapseWhiteSpace();
     for (unsigned i = 0; i < text().length(); ++i) {
-        if ((!whitespaceIsCollapsed && text()[i] == '\t') || text()[i] == noBreakSpace || text()[i] >= HiraganaLetterSmallA)
+        if ((!whitespaceIsCollapsed && text()[i] == '\t') || text()[i] == noBreakSpace || text()[i] == softHyphen || text()[i] >= HiraganaLetterSmallA)
             return false;
     }