Changeset 252530 in webkit

Timestamp:

Nov 17, 2019 12:01:33 PM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Optimize Line::isVisuallyEmpty for the most common inline content.
​https://bugs.webkit.org/show_bug.cgi?id=204259
<rdar://problem/57243610>

Reviewed by Antti Koivisto.

Move the check on text content to the front.

• layout/inlineformatting/InlineLine.cpp:

(WebCore::Layout::Line::isVisuallyEmpty const):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-17  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Optimize Line::isVisuallyEmpty for the most common inline content.
+        https://bugs.webkit.org/show_bug.cgi?id=204259
+        <rdar://problem/57243610>
+
+        Reviewed by Antti Koivisto.
+
+        Move the check on text content to the front.
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::isVisuallyEmpty const):
+
 2019-11-16  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -51 +51 @@
     bool isContainerStart() const { return m_inlineItem.isContainerStart(); }
     bool isContainerEnd() const { return m_inlineItem.isContainerEnd(); }
+    bool isForcedLineBreak() const { return m_inlineItem.isForcedLineBreak(); }
     InlineItem::Type type() const { return m_inlineItem.type(); }
 
@@ -194 +195 @@
     auto& formattingContext = this->formattingContext();
     for (auto& run : m_inlineItemRuns) {
+        if (run->isText()) {
+            if (!run->isCollapsedToZeroAdvanceWidth())
+                return false;
+            continue;
+        }
         if (run->isContainerStart()) {
             if (!isInlineContainerConsideredEmpty(formattingContext, run->layoutBox()))
@@ -201 +207 @@
         if (run->isContainerEnd())
             continue;
-        if (run->layoutBox().establishesFormattingContext()) {
+        if (run->isBox()) {
+            if (!run->layoutBox().establishesFormattingContext())
+                return false;
             ASSERT(run->layoutBox().isInlineBlockBox());
             auto& boxGeometry = formattingContext.geometryForBox(run->layoutBox());
@@ -210 +218 @@
             continue;
         }
-        if (!run->isText() || !run->isCollapsedToZeroAdvanceWidth())
+        if (run->isForcedLineBreak())
             return false;
     }