Changeset 167720 in webkit


Ignore:
Timestamp:
Apr 23, 2014 1:01:01 PM (10 years ago)
Author:
hyatt@apple.com
Message:

[New Multicolumn] Assertion failure in huge-column-count.html
https://bugs.webkit.org/show_bug.cgi?id=132071

Reviewed by Dean Jackson.

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::regionAtBlockOffset):
Remove the code that returned 0 here, since we're going to patch a lower-level
function to catch all cases.

  • rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::getRegionRangeForBox):
Don't allow in-flow RenderFlowThreads to ever have a region range. The sets
are what should have ranges... the flow thread needs to just be ignored.

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r167718 r167720  
     12014-04-23  David Hyatt  <hyatt@apple.com>
     2
     3        [New Multicolumn] Assertion failure in huge-column-count.html
     4        https://bugs.webkit.org/show_bug.cgi?id=132071
     5
     6        Reviewed by Dean Jackson.
     7
     8        * rendering/RenderBlock.cpp:
     9        (WebCore::RenderBlock::regionAtBlockOffset):
     10        Remove the code that returned 0 here, since we're going to patch a lower-level
     11        function to catch all cases.
     12
     13        * rendering/RenderFlowThread.cpp:
     14        (WebCore::RenderFlowThread::getRegionRangeForBox):
     15        Don't allow in-flow RenderFlowThreads to ever have a region range. The sets
     16        are what should have ranges... the flow thread needs to just be ignored.
     17
    1182014-04-23  David Hyatt  <hyatt@apple.com>
    219
  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r167714 r167720  
    48294829RenderRegion* RenderBlock::regionAtBlockOffset(LayoutUnit blockOffset) const
    48304830{
    4831     if (isInFlowRenderFlowThread())
    4832         return 0;
    4833 
    48344831    RenderFlowThread* flowThread = flowThreadContainingBlock();
    48354832    if (!flowThread || !flowThread->hasValidRegionInfo())
  • trunk/Source/WebCore/rendering/RenderFlowThread.cpp

    r167707 r167720  
    761761
    762762    startRegion = endRegion = nullptr;
    763     if (!hasValidRegionInfo()) // We clear the ranges when we invalidate the regions.
     763    if (!hasValidRegionInfo() || box->isInFlowRenderFlowThread()) // We clear the ranges when we invalidate the regions.
    764764        return false;
    765765
Note: See TracChangeset for help on using the changeset viewer.