Changeset 237783 in webkit

Timestamp:

Nov 4, 2018 7:46:38 AM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][BFC] Add support for percentage height in quirks mode.
​https://bugs.webkit.org/show_bug.cgi?id=191232

Reviewed by Antti Koivisto.

Source/WebCore:

In quirks mode, we go and travers the containing block chain to find a block level
box with fixed height value to resolve the percentage value.

Test: fast/block/basic/quirk-mode-percent-height.html

• layout/FormattingContextGeometry.cpp:

(WebCore::Layout::FormattingContext::Geometry::computedHeightValue):

• layout/Verification.cpp:

(WebCore::Layout::LayoutState::verifyAndOutputMismatchingLayoutTree const):

Tools:

• LayoutReloaded/misc/LFC-passing-tests.txt:

LayoutTests:

• fast/block/basic/quirk-mode-percent-height-expected.txt: Added.
• fast/block/basic/quirk-mode-percent-height.html: Added.
• platform/ios/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/basic/quirk-mode-percent-height-expected.txt (added)
• LayoutTests/fast/block/basic/quirk-mode-percent-height.html (added)
• LayoutTests/platform/ios/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/FormattingContextGeometry.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/LayoutReloaded/misc/LFC-passing-tests.txt (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-11-04  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][BFC] Add support for percentage height in quirks mode.
+        https://bugs.webkit.org/show_bug.cgi?id=191232
+
+        Reviewed by Antti Koivisto.
+
+        * fast/block/basic/quirk-mode-percent-height-expected.txt: Added.
+        * fast/block/basic/quirk-mode-percent-height.html: Added.
+        * platform/ios/TestExpectations:
+
 2018-11-04  Zalan Bujtas  <zalan@apple.com>
 

trunk/LayoutTests/platform/ios/TestExpectations

@@ -3118 +3118 @@
 fast/block/basic/height-percentage-simple.html [ Failure ]
 fast/block/basic/child-block-level-box-with-height-percent.html [ Failure ]
+fast/block/basic/quirk-mode-percent-height.html [ Failure ]
 
 # Datalist

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-04  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][BFC] Add support for percentage height in quirks mode.
+        https://bugs.webkit.org/show_bug.cgi?id=191232
+
+        Reviewed by Antti Koivisto.
+
+        In quirks mode, we go and travers the containing block chain to find a block level
+        box with fixed height value to resolve the percentage value.
+
+        Test: fast/block/basic/quirk-mode-percent-height.html
+
+        * layout/FormattingContextGeometry.cpp:
+        (WebCore::Layout::FormattingContext::Geometry::computedHeightValue):
+        * layout/Verification.cpp:
+        (WebCore::Layout::LayoutState::verifyAndOutputMismatchingLayoutTree const):
+
 2018-11-04  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/FormattingContextGeometry.cpp

@@ -69 +69 @@
 
     std::optional<LayoutUnit> containingBlockHeightValue;
-    auto containingBlockHeight = layoutBox.containingBlock()->style().logicalHeight();
-    if (containingBlockHeight.isFixed())
-        containingBlockHeightValue = { containingBlockHeight.value() };
-    else if (layoutBox.isOutOfFlowPositioned()) {
-        // Containing block's height is already computed.
+    if (layoutBox.isOutOfFlowPositioned()) {
+        // Containing block's height is already computed since we layout the out-of-flow boxes as the last step.
         containingBlockHeightValue = layoutState.displayBoxForLayoutBox(*layoutBox.containingBlock()).height();
+    } else {
+        auto computedHeightValueForQuirksMode = [&]() -> LayoutUnit {
+            // In quirks mode, we go and travers the containing block chain to find a block level box with fixed height value, even if it means leaving
+            // the current formatting context. FIXME: surely we need to do some tricks here when block direction support is added.
+            auto* containingBlock = layoutBox.containingBlock();
+            LayoutUnit bodyAndDocumentVerticalMarginsPaddingsAndBorders;
+            while (containingBlock) {
+                auto containingBlockHeight = containingBlock->style().logicalHeight();
+                if (containingBlockHeight.isFixed())
+                    return containingBlockHeight.value() - bodyAndDocumentVerticalMarginsPaddingsAndBorders;
+
+                // If the only fixed value box we find is the ICB, then ignore the body and the document (vertical) margin, padding and border. So much quirkiness.
+                // -and it's totally insane because now we freely travel across formatting context boundaries and computed margins are nonexistent.
+                if (containingBlock->isBodyBox() || containingBlock->isDocumentBox()) {
+                    auto& displayBox = layoutState.displayBoxForLayoutBox(*containingBlock);
+
+                    auto verticalMargins = computedNonCollapsedVerticalMarginValue(layoutState, *containingBlock);
+                    auto verticalPaddings = displayBox.paddingTop().value_or(0) + displayBox.paddingBottom().value_or(0);
+                    auto verticalBorders = displayBox.borderTop() + displayBox.borderBottom();
+                    bodyAndDocumentVerticalMarginsPaddingsAndBorders += verticalMargins.top + verticalMargins.bottom + verticalPaddings + verticalBorders;
+                }
+
+                containingBlock = containingBlock->containingBlock();
+            }
+            // Initial containing block has to have a height.
+            return layoutState.displayBoxForLayoutBox(layoutBox.initialContainingBlock()).contentBox().height() - bodyAndDocumentVerticalMarginsPaddingsAndBorders;
+        };
+
+        if (layoutState.inQuirksMode())
+            containingBlockHeightValue = computedHeightValueForQuirksMode();
+        else {
+            auto containingBlockHeight = layoutBox.containingBlock()->style().logicalHeight();
+            if (containingBlockHeight.isFixed())
+                containingBlockHeightValue = { containingBlockHeight.value() };
+        }
     }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2018-11-04  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][BFC] Add support for percentage height in quirks mode.
+        https://bugs.webkit.org/show_bug.cgi?id=191232
+
+        Reviewed by Antti Koivisto.
+
+        * LayoutReloaded/misc/LFC-passing-tests.txt:
+
 2018-11-04  Zalan Bujtas  <zalan@apple.com>
 

trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt

@@ -72 +72 @@
 fast/block/basic/height-percentage-simple.html
 fast/block/basic/child-block-level-box-with-height-percent.html
+fast/block/basic/quirk-mode-percent-height.html