Changeset 283442 in webkit

Timestamp:

Oct 2, 2021, 6:51:47 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Pass in the correct style when adding a run to Line
​https://bugs.webkit.org/show_bug.cgi?id=231100

Reviewed by Antti Koivisto.

This is in preparation for supporting first-line style.

• layout/formattingContexts/inline/InlineLineBuilder.cpp:

(WebCore::Layout::LineCandidate::InlineContent::appendInlineItem):
(WebCore::Layout::LineBuilder::handleInlineContent):
(WebCore::Layout::LineBuilder::commitPartialContent):
(WebCore::Layout::LineBuilder::rebuildLine):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-02  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Pass in the correct style when adding a run to Line
+        https://bugs.webkit.org/show_bug.cgi?id=231100
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for supporting first-line style.
+
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineCandidate::InlineContent::appendInlineItem):
+        (WebCore::Layout::LineBuilder::handleInlineContent):
+        (WebCore::Layout::LineBuilder::commitPartialContent):
+        (WebCore::Layout::LineBuilder::rebuildLine):
+
 2021-10-02  Cathie Chen  <cathiechen@igalia.com>
 

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

@@ -190 +190 @@
         if (m_ignoreTrailingLetterSpacing)
             return { };
-        auto letterSpacing = inlineItem.style().letterSpacing();
+        auto letterSpacing = style.letterSpacing();
         if (letterSpacing <= 0)
             return { };
@@ -706 +706 @@
         m_lineLogicalRect = lineLogicalRectForCandidateContent;
         for (auto& run : candidateRuns)
-            m_line.append(run.inlineItem, run.inlineItem.style(), run.logicalWidth);
+            m_line.append(run.inlineItem, run.style, run.logicalWidth);
         if (lineCandidate.inlineContent.hasTrailingSoftWrapOpportunity()) {
             // Check if we are allowed to wrap at this position.
@@ -805 +805 @@
             }
             // The partial run is the last content to commit.
-            m_line.append(run.inlineItem, run.inlineItem.style(), run.logicalWidth);
+            m_line.append(run.inlineItem, run.style, run.logicalWidth);
             return;
         }
-        m_line.append(run.inlineItem, run.inlineItem.style(), run.logicalWidth);
+        m_line.append(run.inlineItem, run.style, run.logicalWidth);
     }
 }
@@ -827 +827 @@
     for (; currentItemIndex < layoutRange.end; ++currentItemIndex) {
         auto& inlineItem = m_inlineItems[currentItemIndex];
-        m_line.append(inlineItem, inlineItem.style(), inlineItemWidth(inlineItem, m_line.contentLogicalRight()));
+        auto& style = m_isFirstLine ? inlineItem.firstLineStyle() : inlineItem.style();
+        m_line.append(inlineItem, style, inlineItemWidth(inlineItem, m_line.contentLogicalRight()));
         if (&inlineItem == &lastInlineItemToAdd)
             return currentItemIndex - layoutRange.start + 1;