Title: [267945] trunk/Source/WebCore
- Revision
- 267945
- Author
- [email protected]
- Date
- 2020-10-04 05:22:04 -0700 (Sun, 04 Oct 2020)
Log Message
[LFC][IFC][Soft hyphen] Reset Line::m_trailingSoftHyphenWidth when the text content does not end with a soft hyphen
https://bugs.webkit.org/show_bug.cgi?id=217292
Reviewed by Antti Koivisto.
* layout/inlineformatting/InlineLine.cpp:
(WebCore::Layout::Line::appendTextContent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (267944 => 267945)
--- trunk/Source/WebCore/ChangeLog 2020-10-04 12:13:06 UTC (rev 267944)
+++ trunk/Source/WebCore/ChangeLog 2020-10-04 12:22:04 UTC (rev 267945)
@@ -1,5 +1,15 @@
2020-10-04 Zalan Bujtas <[email protected]>
+ [LFC][IFC][Soft hyphen] Reset Line::m_trailingSoftHyphenWidth when the text content does not end with a soft hyphen
+ https://bugs.webkit.org/show_bug.cgi?id=217292
+
+ Reviewed by Antti Koivisto.
+
+ * layout/inlineformatting/InlineLine.cpp:
+ (WebCore::Layout::Line::appendTextContent):
+
+2020-10-04 Zalan Bujtas <[email protected]>
+
[LFC][IFC][Soft hyphen] endsWithSoftWrapOpportunity should check if hyphenation is disabled
https://bugs.webkit.org/show_bug.cgi?id=217288
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp (267944 => 267945)
--- trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp 2020-10-04 12:13:06 UTC (rev 267944)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp 2020-10-04 12:22:04 UTC (rev 267945)
@@ -325,8 +325,7 @@
m_trimmableTrailingContent.reset();
if (!formattingContext().layoutState().shouldIgnoreTrailingLetterSpacing() && !inlineTextItem.isWhitespace() && style.letterSpacing() > 0)
m_trimmableTrailingContent.addPartiallyTrimmableContent(m_runs.size() - 1, style.letterSpacing());
- if (inlineTextItem.hasTrailingSoftHyphen())
- m_trailingSoftHyphenWidth = InlineLayoutUnit { style.fontCascade().width(TextRun { StringView { style.hyphenString() } }) };
+ m_trailingSoftHyphenWidth = inlineTextItem.hasTrailingSoftHyphen() ? makeOptional(style.fontCascade().width(TextRun { StringView { style.hyphenString() } })) : WTF::nullopt;
}
void Line::appendNonReplacedInlineBox(const InlineItem& inlineItem, InlineLayoutUnit logicalWidth)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
