Changeset 256499 in webkit

Timestamp:

Feb 12, 2020 6:47:01 PM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Remove LineLayoutContext::m_partialTrailingTextItem
​https://bugs.webkit.org/show_bug.cgi?id=207670
<rdar://problem/59405854>

Reviewed by Antti Koivisto.

LineBuilder::Run does not hold a reference to these InlineItems anymore.

• layout/inlineformatting/LineLayoutContext.cpp:

(WebCore::Layout::LineLayoutContext::layoutLine):
(WebCore::Layout::LineLayoutContext::commitPartialContent):

• layout/inlineformatting/LineLayoutContext.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/LineLayoutContext.cpp (modified) (2 diffs)
• layout/inlineformatting/LineLayoutContext.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-12  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Remove LineLayoutContext::m_partialTrailingTextItem
+        https://bugs.webkit.org/show_bug.cgi?id=207670
+        <rdar://problem/59405854>
+
+        Reviewed by Antti Koivisto.
+
+        LineBuilder::Run does not hold a reference to these InlineItems anymore.
+
+        * layout/inlineformatting/LineLayoutContext.cpp:
+        (WebCore::Layout::LineLayoutContext::layoutLine):
+        (WebCore::Layout::LineLayoutContext::commitPartialContent):
+        * layout/inlineformatting/LineLayoutContext.h:
+
 2020-02-12  Pavel Feldman  <pavel.feldman@gmail.com>
 

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

@@ -255 +255 @@
 LineLayoutContext::LineContent LineLayoutContext::layoutLine(LineBuilder& line, const InlineItemRange layoutRange, Optional<unsigned> partialLeadingContentLength)
 {
-    auto reset = [&] {
-        ASSERT(m_floats.isEmpty());
-        m_partialTrailingTextItem = { };
-        m_partialLeadingTextItem = { };
-    };
-    reset();
+    ASSERT(m_floats.isEmpty());
+    m_partialLeadingTextItem = { };
     auto lineBreaker = LineBreaker { };
     auto currentItemIndex = layoutRange.start;
@@ -464 +460 @@
             if (auto partialRun = partialTrailingContent.partialRun) {
                 auto& trailingInlineTextItem = downcast<InlineTextItem>(runs[partialTrailingContent.trailingRunIndex].inlineItem);
-                // FIXME: LineBuilder should not hold on to the InlineItem.
-                ASSERT(!m_partialTrailingTextItem);
-                m_partialTrailingTextItem = trailingInlineTextItem.left(partialRun->length);
-                line.appendPartialTrailingTextItem(*m_partialTrailingTextItem, partialRun->logicalWidth, partialRun->needsHyphen);
+                auto partialTrailingTextItem = trailingInlineTextItem.left(partialRun->length);
+                line.appendPartialTrailingTextItem(partialTrailingTextItem, partialRun->logicalWidth, partialRun->needsHyphen);
                 return;
             }

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

@@ -83 +83 @@
     FloatList m_floats;
     Optional<InlineTextItem> m_partialLeadingTextItem;
-    Optional<InlineTextItem> m_partialTrailingTextItem;
     unsigned m_successiveHyphenatedLineCount { 0 };
 };