Changeset 283275 in webkit

Timestamp:

Sep 29, 2021, 4:27:35 PM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Use the first-line style when measuring text content when applicable
​https://bugs.webkit.org/show_bug.cgi?id=230925

Reviewed by Antti Koivisto.

Disable "simplified content measuring" when first-style is present.

• layout/formattingContexts/inline/InlineLineBuilder.cpp:

(WebCore::Layout::LineBuilder::inlineItemWidth const):

• layout/formattingContexts/inline/InlineTextItem.cpp:

(WebCore::Layout::InlineTextItem::createAndAppendTextItems):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineLineBuilder.cpp (modified) (1 diff)
• layout/formattingContexts/inline/InlineTextItem.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-29  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Use the first-line style when measuring text content when applicable
+        https://bugs.webkit.org/show_bug.cgi?id=230925
+
+        Reviewed by Antti Koivisto.
+
+        Disable "simplified content measuring" when first-style is present.
+
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::inlineItemWidth const):
+        * layout/formattingContexts/inline/InlineTextItem.cpp:
+        (WebCore::Layout::InlineTextItem::createAndAppendTextItems):
+
 2021-09-29  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp

@@ -218 +218 @@
     if (is<InlineTextItem>(inlineItem)) {
         auto& inlineTextItem = downcast<InlineTextItem>(inlineItem);
-        auto& fontCascade = inlineTextItem.layoutBox().style().fontCascade();
-        if (auto contentWidth = inlineTextItem.width())
+        if (auto contentWidth = inlineTextItem.width()) {
+            ASSERT(inlineTextItem.firstLineStyle() == inlineTextItem.style());
             return *contentWidth;
+        }
+        auto& fontCascade = m_isFirstLine ? inlineTextItem.firstLineStyle().fontCascade() : inlineTextItem.style().fontCascade();
         if (!inlineTextItem.isWhitespace() || InlineTextItem::shouldPreserveSpacesAndTabs(inlineTextItem))
             return TextUtil::width(inlineTextItem, fontCascade, contentLogicalLeft);

trunk/Source/WebCore/layout/formattingContexts/inline/InlineTextItem.cpp

@@ -89 +89 @@
         if (!inlineTextBox.canUseSimplifiedContentMeasuring())
             return { };
+        if (inlineTextBox.style() != inlineTextBox.firstLineStyle())
+            return { };
         return TextUtil::width(inlineTextBox, fontCascade, startPosition, startPosition + length, { });
     };