Skip to content
  • robert@webkit.org's avatar
    REGRESSION(r127163): Respect clearance set on ancestors when placing floats · 97037ef5
    robert@webkit.org authored
    https://bugs.webkit.org/show_bug.cgi?id=119979
    
    Reviewed by David Hyatt.
    
    Source/WebCore:
    
    Refactor the way self-collapsing blocks with clearance are positioned so that they
    get the correct logical-top position during margin-collapsing.
    
    Test: fast/block/margin-collapse/self-collapsing-block-with-float-descendants.html
    
    * rendering/RenderBlockFlow.cpp:
    (WebCore::RenderBlockFlow::clearFloats):
    (WebCore::RenderBlockFlow::marginOffsetForSelfCollapsingBlock):
    (WebCore::RenderBlockFlow::collapseMargins):
    (WebCore::RenderBlockFlow::clearFloatsIfNeeded):
    (WebCore::RenderBlockFlow::handleAfterSideOfBlock):
    * rendering/RenderBlockFlow.h:
    
    LayoutTests:
    
    * fast/block/float/clear-negative-margin-top-expected.html:
    * fast/block/float/clear-negative-margin-top.html:
    * fast/block/margin-collapse/self-collapsing-block-with-float-descendants-expected.html: Added.
    * fast/block/margin-collapse/self-collapsing-block-with-float-descendants.html: Added.
    * platform/mac/fast/block/float/024-expected.txt:
    * platform/mac/fast/block/margin-collapse/025-expected.txt:
    * platform/mac/fast/block/margin-collapse/block-inside-inline/025-expected.txt:
    * platform/mac/fast/block/margin-collapse/empty-clear-blocks-expected.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159575 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    97037ef5