Changeset 246062 in webkit

Timestamp:

Jun 4, 2019 7:54:52 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Remove redundant InlineItem::width() calls.
​https://bugs.webkit.org/show_bug.cgi?id=198489
<rdar://problem/51360390>

Reviewed by Antti Koivisto.

This is in preparation for removing InlineItem::width().

• layout/inlineformatting/InlineFormattingContextLineLayout.cpp:

(WebCore::Layout::InlineFormattingContext::LineLayout::handleFloat const):
(WebCore::Layout::InlineFormattingContext::LineLayout::commitInlineItemToLine const):

• layout/inlineformatting/InlineLine.cpp:

(WebCore::Layout::Line::appendNonBreakableSpace):
(WebCore::Layout::Line::appendInlineContainerStart):
(WebCore::Layout::Line::appendInlineContainerEnd):

• layout/inlineformatting/InlineLine.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-04  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Remove redundant InlineItem::width() calls.
+        https://bugs.webkit.org/show_bug.cgi?id=198489
+        <rdar://problem/51360390>
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for removing InlineItem::width().
+
+        * layout/inlineformatting/InlineFormattingContextLineLayout.cpp:
+        (WebCore::Layout::InlineFormattingContext::LineLayout::handleFloat const):
+        (WebCore::Layout::InlineFormattingContext::LineLayout::commitInlineItemToLine const):
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::appendNonBreakableSpace):
+        (WebCore::Layout::Line::appendInlineContainerStart):
+        (WebCore::Layout::Line::appendInlineContainerEnd):
+        * layout/inlineformatting/InlineLine.h:
+
 2019-06-04  Antoine Quint  <graouts@apple.com>
 

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

@@ -341 +341 @@
     m_floatingState.append(floatBox);
     // Shrink availble space for current line and move existing inline runs.
-    auto floatBoxWidth = floatItem.width();
+    auto floatBoxWidth = displayBox.marginBoxWidth();
     floatBox.isLeftFloatingPositioned() ? line.moveLogicalLeft(floatBoxWidth) : line.moveLogicalRight(floatBoxWidth);
 }
@@ -347 +347 @@
 void InlineFormattingContext::LineLayout::commitInlineItemToLine(Line& line, const InlineItem& inlineItem) const
 {
-    if (inlineItem.isContainerStart())
-        return line.appendInlineContainerStart(inlineItem);
-
-    if (inlineItem.isContainerEnd())
-        return line.appendInlineContainerEnd(inlineItem);
-
     if (inlineItem.isHardLineBreak())
         return line.appendHardLineBreak(inlineItem);
 
     auto width = inlineItem.width();
+    auto& fontMetrics = inlineItem.style().fontMetrics();
     if (is<InlineTextItem>(inlineItem))
-        return line.appendTextContent(downcast<InlineTextItem>(inlineItem), { width, inlineItem.style().fontMetrics().height() });
+        return line.appendTextContent(downcast<InlineTextItem>(inlineItem), { width, fontMetrics.height() });
 
     auto& layoutBox = inlineItem.layoutBox();
     auto& displayBox = layoutState().displayBoxForLayoutBox(layoutBox);
+
+    if (inlineItem.isContainerStart()) {
+        auto containerHeight = fontMetrics.height() + displayBox.verticalBorder() + displayBox.verticalPadding().valueOr(0);
+        return line.appendInlineContainerStart(inlineItem, { width, containerHeight });
+    }
+
+    if (inlineItem.isContainerEnd())
+        return line.appendInlineContainerEnd(inlineItem, { width, 0 });
+
     if (layoutBox.isReplaced())
         return line.appendReplacedInlineBox(inlineItem, { width, displayBox.height() });

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

@@ -117 +117 @@
 {
     m_content->runs().append(std::make_unique<Content::Run>(Display::Run { logicalRect }, inlineItem, false, false));
-    m_contentLogicalWidth += inlineItem.width();
-}
-
-void Line::appendInlineContainerStart(const InlineItem& inlineItem)
+    m_contentLogicalWidth += logicalRect.width();
+}
+
+void Line::appendInlineContainerStart(const InlineItem& inlineItem, LayoutSize runSize)
 {
     auto& layoutBox = inlineItem.layoutBox();
@@ -138 +138 @@
     alignAndAdjustLineHeight();
     auto& displayBox = m_layoutState.displayBoxForLayoutBox(layoutBox);
-    auto containerHeight = fontMetrics.height() + displayBox.verticalBorder() + displayBox.verticalPadding().valueOr(0);
     auto logicalTop = -fontMetrics.ascent() - displayBox.borderTop() - displayBox.paddingTop().valueOr(0);
-    auto logicalRect = Display::Rect { logicalTop, contentLogicalRight(), inlineItem.width(), containerHeight };
+    auto logicalRect = Display::Rect { logicalTop, contentLogicalRight(), runSize.width(), runSize.height() };
     appendNonBreakableSpace(inlineItem, logicalRect);
 }
 
-void Line::appendInlineContainerEnd(const InlineItem& inlineItem)
+void Line::appendInlineContainerEnd(const InlineItem& inlineItem, LayoutSize runSize)
 {
     // This is really just a placeholder to mark the end of the inline level container.
-    auto logicalRect = Display::Rect { 0, contentLogicalRight(), inlineItem.width(), 0 };
+    auto logicalRect = Display::Rect { 0, contentLogicalRight(), runSize.width(), runSize.height() };
     appendNonBreakableSpace(inlineItem, logicalRect);
 }

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

@@ -79 +79 @@
     void appendNonReplacedInlineBox(const InlineItem&, LayoutSize);
     void appendReplacedInlineBox(const InlineItem&, LayoutSize);
-    void appendInlineContainerStart(const InlineItem&);
-    void appendInlineContainerEnd(const InlineItem&);
+    void appendInlineContainerStart(const InlineItem&, LayoutSize);
+    void appendInlineContainerEnd(const InlineItem&, LayoutSize);
     void appendHardLineBreak(const InlineItem&);