Changeset 143486 in webkit


Ignore:
Timestamp:
Feb 20, 2013 1:00:24 PM (11 years ago)
Author:
hyatt@apple.com
Message:

[New Multicolumn] RenderMultiColumnFlowThreads should establish a BFC.
​https://bugs.webkit.org/show_bug.cgi?id=110366.

Reviewed by Antti Koivisto.

Source/WebCore:

RenderFlowThreads should establish a block formatting context always.
CSS Regions have named flow thread that they absolutely position, and so
they got this for free by being absolutely positioned.

RenderMultiColumnFlowThreads, however, are relative positioned, so we need
to just add an isRenderFlowThread case specifically so we're not dependent
on the positioning scheme used for the flow thread to establish the BFC.

Test: fast/multicol/newmulticol/float-*.html.

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::MarginInfo::MarginInfo):

LayoutTests:

  • fast/multicol/newmulticol/float-avoidance-expected.html: Added.
  • fast/multicol/newmulticol/float-avoidance.html: Added.
  • fast/multicol/newmulticol/float-multicol-expected.html: Added.
  • fast/multicol/newmulticol/float-multicol.html: Added.
  • fast/multicol/newmulticol/float-paginate-complex-expected.html: Added.
  • fast/multicol/newmulticol/float-paginate-complex.html: Added.
  • fast/multicol/newmulticol/float-paginate-empty-lines-expected.html: Added.
  • fast/multicol/newmulticol/float-paginate-empty-lines.html: Added.
  • fast/multicol/newmulticol/float-paginate-expected.html: Added.
  • fast/multicol/newmulticol/float-paginate.html: Added.
Location:
trunk
Files:
10 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r143484 r143486  
     12013-02-20  David Hyatt  <hyatt@apple.com>
     2
     3        [New Multicolumn] RenderMultiColumnFlowThreads should establish a BFC.
     4        https://bugs.webkit.org/show_bug.cgi?id=110366.
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * fast/multicol/newmulticol/float-avoidance-expected.html: Added.
     9        * fast/multicol/newmulticol/float-avoidance.html: Added.
     10        * fast/multicol/newmulticol/float-multicol-expected.html: Added.
     11        * fast/multicol/newmulticol/float-multicol.html: Added.
     12        * fast/multicol/newmulticol/float-paginate-complex-expected.html: Added.
     13        * fast/multicol/newmulticol/float-paginate-complex.html: Added.
     14        * fast/multicol/newmulticol/float-paginate-empty-lines-expected.html: Added.
     15        * fast/multicol/newmulticol/float-paginate-empty-lines.html: Added.
     16        * fast/multicol/newmulticol/float-paginate-expected.html: Added.
     17        * fast/multicol/newmulticol/float-paginate.html: Added.
     18
    1192013-02-20  David Hyatt  <hyatt@apple.com>
    220

  • trunk/Source/WebCore/ChangeLog

    r143484 r143486  
     12013-02-20  David Hyatt  <hyatt@apple.com>
     2
     3        [New Multicolumn] RenderMultiColumnFlowThreads should establish a BFC.
     4        https://bugs.webkit.org/show_bug.cgi?id=110366.
     5
     6        Reviewed by Antti Koivisto.
     7
     8        RenderFlowThreads should establish a block formatting context always.
     9        CSS Regions have named flow thread that they absolutely position, and so
     10        they got this for free by being absolutely positioned.
     11       
     12        RenderMultiColumnFlowThreads, however, are relative positioned, so we need
     13        to just add an isRenderFlowThread case specifically so we're not dependent
     14        on the positioning scheme used for the flow thread to establish the BFC.
     15       
     16        Test: fast/multicol/newmulticol/float-*.html.
     17
     18        * rendering/RenderBlock.cpp:
     19        (WebCore::RenderBlock::MarginInfo::MarginInfo):
     20
    1212013-02-20  David Hyatt  <hyatt@apple.com>
    222

  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r143483 r143486  
    176176    m_canCollapseWithChildren = !block->isRenderView() && !block->isRoot() && !block->isOutOfFlowPositioned()
    177177        && !block->isFloating() && !block->isTableCell() && !block->hasOverflowClip() && !block->isInlineBlockOrInlineTable()
    178         && !block->isWritingModeRoot() && !block->parent()->isFlexibleBox() && blockStyle->hasAutoColumnCount() && blockStyle->hasAutoColumnWidth()
    179         && !blockStyle->columnSpan();
     178        && !block->isRenderFlowThread() && !block->isWritingModeRoot() && !block->parent()->isFlexibleBox()
     179        && blockStyle->hasAutoColumnCount() && blockStyle->hasAutoColumnWidth() && !blockStyle->columnSpan();
    180180
    181181    m_canCollapseMarginBeforeWithChildren = m_canCollapseWithChildren && !beforeBorderPadding && blockStyle->marginBeforeCollapse() != MSEPARATE;
Note: See TracChangeset for help on using the changeset viewer.