Changeset 240545 in webkit


Ignore:
Timestamp:
Jan 26, 2019 5:13:00 AM (5 years ago)
Author:
Alan Bujtas
Message:

[LFC][BFC][MarginCollapsing] marginAfterCollapsesWithParentMarginAfter/marginAfterCollapsesWithLastInFlowChildMarginAfter should check for border/padding after values.
https://bugs.webkit.org/show_bug.cgi?id=193864

Reviewed by Antti Koivisto.

  • layout/blockformatting/BlockMarginCollapse.cpp:

(WebCore::Layout::BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithParentMarginAfter):
(WebCore::Layout::BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithLastInFlowChildMarginAfter):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r240544 r240545  
     12019-01-26  Zalan Bujtas  <zalan@apple.com>
     2
     3        [LFC][BFC][MarginCollapsing] marginAfterCollapsesWithParentMarginAfter/marginAfterCollapsesWithLastInFlowChildMarginAfter should check for border/padding after values.
     4        https://bugs.webkit.org/show_bug.cgi?id=193864
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * layout/blockformatting/BlockMarginCollapse.cpp:
     9        (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithParentMarginAfter):
     10        (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithLastInFlowChildMarginAfter):
     11
    1122019-01-26  Zalan Bujtas  <zalan@apple.com>
    213
  • trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp

    r240475 r240545  
    296296
    297297    // the box has no bottom padding, and
    298     if (hasPaddingBefore(parent))
     298    if (hasPaddingAfter(parent))
    299299        return false;
    300300
    301301    // the box has no bottom border, and
    302     if (hasBorderBefore(parent))
     302    if (hasBorderAfter(parent))
    303303        return false;
    304304
     
    338338
    339339    // the box has no bottom padding, and
    340     if (hasPaddingBefore(layoutBox))
     340    if (hasPaddingAfter(layoutBox))
    341341        return false;
    342342
    343343    // the box has no bottom border, and
    344     if (hasBorderBefore(layoutBox))
     344    if (hasBorderAfter(layoutBox))
    345345        return false;
    346346
Note: See TracChangeset for help on using the changeset viewer.