Changeset 252967 in webkit

Timestamp:

Dec 1, 2019 7:27:07 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Add support for word-spacing property
​https://bugs.webkit.org/show_bug.cgi?id=204723
<rdar://problem/57541871>

Reviewed by Antti Koivisto.

• layout/inlineformatting/InlineLineBuilder.cpp:

(WebCore::Layout::LineBuilder::TrimmableContent::append):

• layout/inlineformatting/LineLayoutContext.cpp:

(WebCore::Layout::inlineItemWidth):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineLineBuilder.cpp (modified) (1 diff)
• layout/inlineformatting/LineLayoutContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-12-01  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Add support for word-spacing property
+        https://bugs.webkit.org/show_bug.cgi?id=204723
+        <rdar://problem/57541871>
+
+        Reviewed by Antti Koivisto.
+
+        * layout/inlineformatting/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::TrimmableContent::append):
+        * layout/inlineformatting/LineLayoutContext.cpp:
+        (WebCore::Layout::inlineItemWidth):
+
 2019-11-30  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/layout/inlineformatting/InlineLineBuilder.cpp

@@ -711 +711 @@
 void LineBuilder::TrimmableContent::append(LayoutUnit itemRunWidth, size_t runIndex)
 {
-    ASSERT(itemRunWidth >= 0);
+    // word-spacing could very well be negative, but it does not mean that the line gains that much extra space when the content is trimmed.
+    itemRunWidth = std::max(0_lu, itemRunWidth);
     m_width += itemRunWidth;
     m_runIndexes.append(runIndex);

trunk/Source/WebCore/layout/inlineformatting/LineLayoutContext.cpp

@@ -39 +39 @@
 {
     if (inlineItem.isForcedLineBreak())
-        return 0;
+        return { };
 
     if (is<InlineTextItem>(inlineItem)) {
         auto& inlineTextItem = downcast<InlineTextItem>(inlineItem);
-        if (auto contentWidth = inlineTextItem.width())
-            return *contentWidth;
-        auto end = inlineTextItem.isCollapsible() ? inlineTextItem.start() + 1 : inlineTextItem.end();
-        return TextUtil::width(inlineTextItem.layoutBox(), inlineTextItem.start(), end, contentLogicalLeft);
+        auto contentWidth = inlineTextItem.width();
+        if (!contentWidth) {
+            auto end = inlineTextItem.isCollapsible() ? inlineTextItem.start() + 1 : inlineTextItem.end();
+            contentWidth = TextUtil::width(inlineTextItem.layoutBox(), inlineTextItem.start(), end, contentLogicalLeft);
+        }
+        auto wordSpacing = inlineTextItem.isWhitespace() ? LayoutUnit(inlineTextItem.style().fontCascade().wordSpacing()) : 0_lu;
+        return *contentWidth + wordSpacing;
     }