Changeset 286099 in webkit

Timestamp:

Nov 21, 2021, 8:51:11 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Introduce canCacheMeasuredWidthOnInlineTextItem
​https://bugs.webkit.org/show_bug.cgi?id=233399

Reviewed by Antti Koivisto.

This patch is in preparation for decoupling simplified text measuring and measured width caching.
(Caching should solely be position and (maybe) context dependent.)

• layout/formattingContexts/inline/InlineItemsBuilder.cpp:

(WebCore::Layout::canCacheMeasuredWidthOnInlineTextItem const):
(WebCore::Layout::InlineItemsBuilder::handleTextContent):

• layout/formattingContexts/inline/text/TextUtil.cpp:

(WebCore::Layout::TextUtil::canUseSimplifiedTextMeasuringForFirstLine): Deleted.

• layout/formattingContexts/inline/text/TextUtil.h:
• layout/integration/LayoutIntegrationBoxTree.cpp:

(WebCore::LayoutIntegration::BoxTree::buildTree): whitespace is not part of the first-line style set.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineItemsBuilder.cpp (modified) (4 diffs)
• layout/formattingContexts/inline/text/TextUtil.cpp (modified) (1 diff)
• layout/formattingContexts/inline/text/TextUtil.h (modified) (1 diff)
• layout/integration/LayoutIntegrationBoxTree.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-21  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Introduce canCacheMeasuredWidthOnInlineTextItem
+        https://bugs.webkit.org/show_bug.cgi?id=233399
+
+        Reviewed by Antti Koivisto.
+
+        This patch is in preparation for decoupling simplified text measuring and measured width caching.
+        (Caching should solely be position and (maybe) context dependent.)
+
+        * layout/formattingContexts/inline/InlineItemsBuilder.cpp:
+        (WebCore::Layout::canCacheMeasuredWidthOnInlineTextItem const):
+        (WebCore::Layout::InlineItemsBuilder::handleTextContent):
+        * layout/formattingContexts/inline/text/TextUtil.cpp:
+        (WebCore::Layout::TextUtil::canUseSimplifiedTextMeasuringForFirstLine): Deleted.
+        * layout/formattingContexts/inline/text/TextUtil.h:
+        * layout/integration/LayoutIntegrationBoxTree.cpp:
+        (WebCore::LayoutIntegration::BoxTree::buildTree): whitespace is not part of the first-line style set.
+
 2021-11-20  Alan Bujtas  <zalan@apple.com>
 

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

@@ -350 +350 @@
 }
 
+static inline bool canCacheMeasuredWidthOnInlineTextItem(const InlineTextBox& inlineTextBox)
+{
+    // FIXME: Disable width caching for position dependent content only.
+    if (!inlineTextBox.canUseSimplifiedContentMeasuring())
+        return false;
+    return inlineTextBox.style().fontCascade() == inlineTextBox.firstLineStyle().fontCascade();
+}
+
 void InlineItemsBuilder::handleTextContent(const InlineTextBox& inlineTextBox, InlineItems& inlineItems)
 {
@@ -369 +377 @@
     unsigned currentPosition = 0;
 
-    auto inlineItemWidth = [&](auto startPosition, auto length) -> std::optional<InlineLayoutUnit> {
-        if (hasSeenBidiContent()) {
-            // Delay content measuring until bidi split.
-            return { };
-        }
-        if (!inlineTextBox.canUseSimplifiedContentMeasuring()
-            || !TextUtil::canUseSimplifiedTextMeasuringForFirstLine(inlineTextBox.style(), inlineTextBox.firstLineStyle()))
+    auto textWidth = [&](auto startPosition, auto length) -> std::optional<InlineLayoutUnit> {
+        // Delay content measuring until after bidi split.
+        if (hasSeenBidiContent() || !canCacheMeasuredWidthOnInlineTextItem(inlineTextBox))
             return { };
         return TextUtil::width(inlineTextBox, fontCascade, startPosition, startPosition + length, { });
@@ -401 +405 @@
             auto appendWhitespaceItem = [&] (auto startPosition, auto itemLength) {
                 auto simpleSingleWhitespaceContent = inlineTextBox.canUseSimplifiedContentMeasuring() && (itemLength == 1 || whitespaceContentIsTreatedAsSingleSpace);
-                auto width = simpleSingleWhitespaceContent ? std::make_optional(InlineLayoutUnit { fontCascade.spaceWidth() }) : inlineItemWidth(startPosition, itemLength);
+                auto width = simpleSingleWhitespaceContent ? std::make_optional(InlineLayoutUnit { fontCascade.spaceWidth() }) : textWidth(startPosition, itemLength);
                 inlineItems.append(InlineTextItem::createWhitespaceItem(inlineTextBox, startPosition, itemLength, UBIDI_DEFAULT_LTR, whitespaceContent->isWordSeparator, width));
             };
@@ -435 +439 @@
             ASSERT_IMPLIES(style.hyphens() == Hyphens::None, !hasTrailingSoftHyphen);
             auto inlineItemLength = endPosition - startPosition;
-            inlineItems.append(InlineTextItem::createNonWhitespaceItem(inlineTextBox, startPosition, inlineItemLength, UBIDI_DEFAULT_LTR, hasTrailingSoftHyphen, inlineItemWidth(startPosition, inlineItemLength)));
+            inlineItems.append(InlineTextItem::createNonWhitespaceItem(inlineTextBox, startPosition, inlineItemLength, UBIDI_DEFAULT_LTR, hasTrailingSoftHyphen, textWidth(startPosition, inlineItemLength)));
             currentPosition = endPosition;
 

trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp

@@ -247 +247 @@
 }
 
-bool TextUtil::canUseSimplifiedTextMeasuringForFirstLine(const RenderStyle& style, const RenderStyle& firstLineStyle)
-{
-    return style.collapseWhiteSpace() == firstLineStyle.collapseWhiteSpace() && style.fontCascade() == firstLineStyle.fontCascade();
-}
-
 bool TextUtil::containsBidiText(StringView text)
 {

trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h

@@ -63 +63 @@
     static bool shouldPreserveSpacesAndTabs(const Box&);
     static bool shouldPreserveNewline(const Box&);
-    static bool canUseSimplifiedTextMeasuringForFirstLine(const RenderStyle&, const RenderStyle& firstLineStyle);
     static bool isWrappingAllowed(const RenderStyle&);
     static bool containsBidiText(StringView);

trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp

@@ -93 +93 @@
             auto& textRenderer = downcast<RenderText>(childRenderer);
             auto style = RenderStyle::createAnonymousStyleWithDisplay(textRenderer.style(), DisplayType::Inline);
-            auto canUseSimplifiedTextMeasuring = [&] {
-                if (!textRenderer.canUseSimplifiedTextMeasuring())
-                    return false;
-                return !firstLineStyle || Layout::TextUtil::canUseSimplifiedTextMeasuringForFirstLine(style, *firstLineStyle);
-            }();
             auto text = style.textSecurity() == TextSecurity::None ? textRenderer.text() : RenderBlock::updateSecurityDiscCharacters(style, textRenderer.text());
             auto containsBidiText = Layout::TextUtil::containsBidiText(text);
             if (containsBidiText)
                 textRenderer.setContainsBidiText();
-
-            return makeUnique<Layout::InlineTextBox>(text, canUseSimplifiedTextMeasuring, containsBidiText, WTFMove(style), WTFMove(firstLineStyle));
+            auto useSimplifiedTextMeasuring = textRenderer.canUseSimplifiedTextMeasuring() && (!firstLineStyle || firstLineStyle->fontCascade() == style.fontCascade());
+            return makeUnique<Layout::InlineTextBox>(text, useSimplifiedTextMeasuring, containsBidiText, WTFMove(style), WTFMove(firstLineStyle));
         }