Attachment 372202 Details for Bug 198894 – Patch

[patch] Patch

bug-198894-20190615165237.patch (text/plain), 2.07 KB, created by zalan on 2019-06-15 16:52:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-06-15 16:52:37 PDT

Size: 2.07 KB

patch

obsolete

>Subversion Revision: 246468
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 207d6627ad65528293e833735fbb86f175eb3a80..c43f0d610cc00d8ba081783d3f700b1acf4b9fc9 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-06-15  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 NOBODY (OOPS!).
>+
>+        Non-zero width/height inline-block boxes make the line visually non-empty.
>+
>+        * layout/inlineformatting/InlineLine.cpp:
>+        (WebCore::Layout::Line::isVisuallyEmpty const):
>+
> 2019-06-15  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][IFC] Ignore descent when in limited/full quirks mode
>diff --git a/Source/WebCore/layout/inlineformatting/InlineLine.cpp b/Source/WebCore/layout/inlineformatting/InlineLine.cpp
>index 9f492a82e90db626c2a1c69ba3a8377ce010cca1..bfec8a8df1f9ecf1333e34d43d7767e290738d0e 100644
>--- a/Source/WebCore/layout/inlineformatting/InlineLine.cpp
>+++ b/Source/WebCore/layout/inlineformatting/InlineLine.cpp
>@@ -65,6 +65,7 @@ Line::Line(const LayoutState& layoutState, const LayoutPoint& topLeft, LayoutUni
> 
> bool Line::isVisuallyEmpty() const
> {
>+    ASSERT(!m_skipVerticalAligment);
>     // FIXME: This should be cached instead -as the inline items are being added.
>     // Return true for empty inline containers like <span></span>.
>     for (auto& run : m_content->runs()) {
>@@ -76,6 +77,13 @@ bool Line::isVisuallyEmpty() const
>         }
>         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() || !displayBox.height())
>+                continue;
>+            return false;
>+        }
>         if (!run->isCollapsed)
>             return false;
>     }

Flags:

koivisto: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 198894: 372202 | 372214