Changeset 252776 in webkit

Timestamp:

Nov 22, 2019, 8:37:12 AM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Line::inlineItemContentHeight should only call FormattingContext::geometryForBox when needed
​https://bugs.webkit.org/show_bug.cgi?id=204516
<rdar://problem/57429153>

Reviewed by Antti Koivisto.

Line::inlineItemContentHeight is hot and geometryForBox() is a hash lookup. Let's not call it unless we need to.

• layout/inlineformatting/InlineLine.cpp:

(WebCore::Layout::Line::inlineItemContentHeight const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineLine.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Line::inlineItemContentHeight should only call FormattingContext::geometryForBox when needed
+        https://bugs.webkit.org/show_bug.cgi?id=204516
+        <rdar://problem/57429153>
+
+        Reviewed by Antti Koivisto.
+
+        Line::inlineItemContentHeight is hot and geometryForBox() is a hash lookup. Let's not call it unless we need to.
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::inlineItemContentHeight const):
+
 2019-11-22  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -693 +693 @@
         return fontMetrics.height();
 
+    if (inlineItem.isContainerStart() || inlineItem.isContainerEnd())
+        return fontMetrics.height();
+
     auto& layoutBox = inlineItem.layoutBox();
     auto& boxGeometry = formattingContext().geometryForBox(layoutBox);
-
     if (layoutBox.replaced() || layoutBox.isFloatingPositioned())
         return boxGeometry.contentBoxHeight();
-
-    if (inlineItem.isContainerStart() || inlineItem.isContainerEnd())
-        return fontMetrics.height();
 
     // Non-replaced inline box (e.g. inline-block). It looks a bit misleading but their margin box is considered the content height here.