Changeset 252829 in webkit

Timestamp:

Nov 23, 2019 5:33:49 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Remove unnecessary Line::hasContent() calls in LineLayout::placeInlineItem
​https://bugs.webkit.org/show_bug.cgi?id=204540
<rdar://problem/57443500>

Reviewed by Antti Koivisto.

LineLayout::placeInlineItem is hot. This shaves off ~3% on line-layout-simple.html

• layout/inlineformatting/InlineLineLayout.cpp:

(WebCore::Layout::LineLayout::placeInlineItem):

• page/FrameView.cpp:

(WebCore::FrameView::paintContents):

• page/FrameViewLayoutContext.cpp:

(WebCore::FrameViewLayoutContext::layoutUsingFormattingContext):
(WebCore::FrameViewLayoutContext::layout):

• rendering/updating/RenderTreeBuilder.cpp:

(WebCore::RenderTreeBuilder::attachToRenderElementInternal):

• rendering/updating/RenderTreeUpdater.cpp:

(WebCore::RenderTreeUpdater::updateRendererStyle):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-23  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Remove unnecessary Line::hasContent() calls in LineLayout::placeInlineItem
+        https://bugs.webkit.org/show_bug.cgi?id=204540
+        <rdar://problem/57443500>
+
+        Reviewed by Antti Koivisto.
+
+        LineLayout::placeInlineItem is hot. This shaves off ~3% on line-layout-simple.html 
+
+        * layout/inlineformatting/InlineLineLayout.cpp:
+        (WebCore::Layout::LineLayout::placeInlineItem):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::paintContents):
+        * page/FrameViewLayoutContext.cpp:
+        (WebCore::FrameViewLayoutContext::layoutUsingFormattingContext):
+        (WebCore::FrameViewLayoutContext::layout):
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::attachToRenderElementInternal):
+        * rendering/updating/RenderTreeUpdater.cpp:
+        (WebCore::RenderTreeUpdater::updateRendererStyle):
+
 2019-11-23  Antti Koivisto  <antti@apple.com>
 

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

@@ -167 +167 @@
     auto currentLogicalRight = m_line.lineBox().logicalRight();
     auto itemLogicalWidth = inlineItemWidth(formattingContext(), inlineItem, currentLogicalRight);
-    auto lineIsConsideredEmpty = !m_line.hasContent() && !m_lineHasIntrusiveFloat;
 
     // Floats are special, they are intrusive but they don't really participate in the line layout context.
@@ -179 +178 @@
                 return IsEndOfLine::Yes;
         }
+        auto lineIsConsideredEmpty = !m_line.hasContent() && !m_lineHasIntrusiveFloat;
         if (LineBreaker().shouldWrapFloatBox(itemLogicalWidth, m_line.availableWidth() + m_line.trailingTrimmableWidth(), lineIsConsideredEmpty))
             return IsEndOfLine::Yes;