Changeset 246480 in webkit

Timestamp:

Jun 16, 2019, 1:02:17 PM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Line::isVisuallyEmpty should check inline-block boxes.
​https://bugs.webkit.org/show_bug.cgi?id=198894
<rdar://problem/51780886>

Reviewed by Antti Koivisto.

Non-zero width/height inline-block boxes make the line visually non-empty.

• layout/inlineformatting/InlineLine.cpp:

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-16  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Line::isVisuallyEmpty should check inline-block boxes.
+        https://bugs.webkit.org/show_bug.cgi?id=198894
+        <rdar://problem/51780886>
+
+        Reviewed by Antti Koivisto.
+
+        Non-zero width/height inline-block boxes make the line visually non-empty.
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::isVisuallyEmpty const):
+
 2019-06-16  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -77 +77 @@
         if (run->inlineItem.isContainerEnd())
             continue;
+        if (run->inlineItem.layoutBox().establishesFormattingContext()) {
+            ASSERT(run->inlineItem.layoutBox().isInlineBlockBox());
+            auto& displayBox = m_layoutState.displayBoxForLayoutBox(run->inlineItem.layoutBox());
+            if (!displayBox.width())
+                continue;
+            if (m_skipVerticalAligment || displayBox.height())
+                return false;
+            continue;
+        }
         if (!run->isCollapsed)
             return false;