Changeset 253013 in webkit

Timestamp:

Dec 2, 2019 3:03:15 PM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC] Fix ASSERT while running fast/block/block-parent-with-zero-width-child.html
​https://bugs.webkit.org/show_bug.cgi?id=204768

Reviewed by Antti Koivisto.

1. FormattingState::displayInlineContent() returns nullptr in case of empty inline content.
2. Typo in InlineItemRun::moveHorizontally

• layout/blockformatting/BlockMarginCollapse.cpp:

(WebCore::Layout::BlockFormattingContext::MarginCollapse::marginsCollapseThrough const):

• layout/inlineformatting/InlineLineBuilder.h:

(WebCore::Layout::LineBuilder::InlineItemRun::moveHorizontally):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/blockformatting/BlockMarginCollapse.cpp (modified) (1 diff)
• layout/inlineformatting/InlineLineBuilder.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-12-02  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Fix ASSERT while running fast/block/block-parent-with-zero-width-child.html
+        https://bugs.webkit.org/show_bug.cgi?id=204768
+
+        Reviewed by Antti Koivisto.
+
+        1. FormattingState::displayInlineContent() returns nullptr in case of empty inline content.
+        2. Typo in InlineItemRun::moveHorizontally
+
+        * layout/blockformatting/BlockMarginCollapse.cpp:
+        (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginsCollapseThrough const):
+        * layout/inlineformatting/InlineLineBuilder.h:
+        (WebCore::Layout::LineBuilder::InlineItemRun::moveHorizontally):
+
 2019-12-02  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp

@@ -396 +396 @@
             auto isConsideredEmpty = [&] {
                 auto& formattingState = downcast<InlineFormattingState>(layoutState.establishedFormattingState(layoutContainer));
-                for (auto& lineBox : formattingState.displayInlineContent()->lineBoxes) {
-                    if (!lineBox.isConsideredEmpty())
-                        return false;
+                if (auto* inlineContent = formattingState.displayInlineContent()) {
+                    for (auto& lineBox : inlineContent->lineBoxes) {
+                        if (!lineBox.isConsideredEmpty())
+                            return false;
+                    }
                 }
                 // Any float box in this formatting context prevents collapsing through.

trunk/Source/WebCore/layout/inlineformatting/InlineLineBuilder.h

@@ -173 +173 @@
         bool isCollapsed() const { return m_isCollapsed; }
 
-        void moveHorizontally(LayoutUnit offset) { m_logicalWidth += offset; }
+        void moveHorizontally(LayoutUnit offset) { m_logicalLeft += offset; }
 
         void removeTrailingLetterSpacing();