⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 239991 in webkit


Ignore:
Timestamp:
Jan 15, 2019, 10:27:06 AM (8 years ago)
Author:
Alan Bujtas
Message:

[LFC][Out-of-flow] Ignore bottom when the vertical values are over-constrained
​https://bugs.webkit.org/show_bug.cgi?id=193448

Reviewed by Antti Koivisto.

Source/WebCore:

Add missing check. We should only resolve auto values.

Test: fast/block/block-only/non-auto-top-bottom-left-right-widht-height-out-of-flow.html

  • layout/FormattingContextGeometry.cpp:

(WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedVerticalGeometry):

Tools:

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

LayoutTests:

  • fast/block/block-only/non-auto-top-bottom-left-right-widht-height-out-of-flow-expected.txt: Added.
  • fast/block/block-only/non-auto-top-bottom-left-right-widht-height-out-of-flow.html: Added.
Location:
trunk
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r239990 r239991  
     12019-01-15  Zalan Bujtas  <zalan@apple.com>
     2
     3        [LFC][Out-of-flow] Ignore bottom when the vertical values are over-constrained
     4        https://bugs.webkit.org/show_bug.cgi?id=193448
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * fast/block/block-only/non-auto-top-bottom-left-right-widht-height-out-of-flow-expected.txt: Added.
     9        * fast/block/block-only/non-auto-top-bottom-left-right-widht-height-out-of-flow.html: Added.
     10
    1112019-01-15  Devin Rousso  <drousso@apple.com>
    212

  • trunk/Source/WebCore/ChangeLog

    r239987 r239991  
     12019-01-15  Zalan Bujtas  <zalan@apple.com>
     2
     3        [LFC][Out-of-flow] Ignore bottom when the vertical values are over-constrained
     4        https://bugs.webkit.org/show_bug.cgi?id=193448
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Add missing check. We should only resolve auto values.
     9
     10        Test: fast/block/block-only/non-auto-top-bottom-left-right-widht-height-out-of-flow.html
     11
     12        * layout/FormattingContextGeometry.cpp:
     13        (WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedVerticalGeometry):
     14
    1152019-01-15  Devin Rousso  <drousso@apple.com>
    216

  • trunk/Source/WebCore/layout/FormattingContextGeometry.cpp

    r239983 r239991  
    302302            usedVerticalMargin.after = *computedVerticalMargin.after;
    303303            usedVerticalMargin.before = containingBlockHeight - (*top + borderTop + paddingTop + contentHeight() + paddingBottom + borderBottom + usedVerticalMargin.after + *bottom);
    304         } else {
     304        } else if (!computedVerticalMargin.after) {
    305305            usedVerticalMargin.before = *computedVerticalMargin.before;
    306306            usedVerticalMargin.after = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + contentHeight() + paddingBottom + borderBottom + *bottom);
    … …  
    308308        // Over-constrained?
    309309        auto boxHeight = *top + usedVerticalMargin.before + borderTop + paddingTop + contentHeight() + paddingBottom + borderBottom + usedVerticalMargin.after + *bottom;
    310         if (boxHeight > containingBlockHeight)
     310        if (boxHeight != containingBlockHeight)
    311311            bottom = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + contentHeight() + paddingBottom + borderBottom + usedVerticalMargin.after);
    312312    }

  • trunk/Tools/ChangeLog

    r239989 r239991  
     12019-01-15  Zalan Bujtas  <zalan@apple.com>
     2
     3        [LFC][Out-of-flow] Ignore bottom when the vertical values are over-constrained
     4        https://bugs.webkit.org/show_bug.cgi?id=193448
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * LayoutReloaded/misc/LFC-passing-tests.txt:
     9
    1102019-01-15  Jonathan Bedard  <jbedard@apple.com>
    211

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

    r239983 r239991  
    7979fast/block/block-only/box-sizing-inflow-out-of-flow-simple.html
    8080fast/block/block-only/out-of-flow-with-containing-block-border-padding.html
     81fast/block/block-only/non-auto-top-bottom-left-right-widht-height-out-of-flow.html
    8182fast/block/basic/002.html
    8283fast/block/basic/003.html
Note: See TracChangeset for help on using the changeset viewer.