Title: [270535] trunk/Source/WebCore
Revision
270535
Author
za...@apple.com
Date
2020-12-08 06:24:50 -0800 (Tue, 08 Dec 2020)

Log Message

[LFC][IFC] Trimmable content can include <wbr>
https://bugs.webkit.org/show_bug.cgi?id=219613

Reviewed by Antti Koivisto.

Trailing <wbr> can be part of the trimmable trailing content.

* layout/inlineformatting/InlineLine.cpp:
(WebCore::Layout::Line::TrimmableTrailingContent::remove):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (270534 => 270535)


--- trunk/Source/WebCore/ChangeLog	2020-12-08 14:11:02 UTC (rev 270534)
+++ trunk/Source/WebCore/ChangeLog	2020-12-08 14:24:50 UTC (rev 270535)
@@ -1,5 +1,17 @@
 2020-12-08  Zalan Bujtas  <za...@apple.com>
 
+        [LFC][IFC] Trimmable content can include <wbr>
+        https://bugs.webkit.org/show_bug.cgi?id=219613
+
+        Reviewed by Antti Koivisto.
+
+        Trailing <wbr> can be part of the trimmable trailing content.
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::TrimmableTrailingContent::remove):
+
+2020-12-08  Zalan Bujtas  <za...@apple.com>
+
         [LFC][IFC] Do not keep the inline box "start" inline item on the current line when its content does not fit anymore
         https://bugs.webkit.org/show_bug.cgi?id=219627
 

Modified: trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp (270534 => 270535)


--- trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp	2020-12-08 14:11:02 UTC (rev 270534)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp	2020-12-08 14:24:50 UTC (rev 270535)
@@ -437,7 +437,7 @@
     // not produce a run since in ::appendText() we see it as a fully collapsible run.
     for (auto index = *m_firstTrimmableRunIndex + 1; index < m_runs.size(); ++index) {
         auto& run = m_runs[index];
-        ASSERT(run.isInlineBoxStart() || run.isInlineBoxEnd() || run.isLineBreak());
+        ASSERT(run.isWordBreakOpportunity() || run.isInlineBoxStart() || run.isInlineBoxEnd() || run.isLineBreak());
         run.moveHorizontally(-trimmableWidth);
     }
     if (!trimmableRun.textContent()->length()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to