Commit ce2c3011 authored by mitz@apple.com's avatar mitz@apple.com

WebCore:

        Reviewed by Darin Adler.

        - fix <rdar://problem/5961977> Crash in RenderBlock::layoutColumns()

        Test: fast/multicol/content-height-zero-crash.html

        * rendering/RenderBlock.cpp:
        (WebCore::RenderBlock::layoutColumns): Changed to not keep creating
        overflow columns that have zero height, because they do not help with
        fitting content in.

LayoutTests:

        - test for <rdar://problem/5961977> Crash in RenderBlock::layoutColumns()

        Reviewed by Darin Adler.

        * fast/multicol/content-height-zero-crash-expected.txt: Added.
        * fast/multicol/content-height-zero-crash.html: Added.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@34458 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 46bbbf6d
2008-06-08 Dan Bernstein <mitz@apple.com>
- test for <rdar://problem/5961977> Crash in RenderBlock::layoutColumns()
Reviewed by Darin Adler.
* fast/multicol/content-height-zero-crash-expected.txt: Added.
* fast/multicol/content-height-zero-crash.html: Added.
2008-06-08 Cameron Zwarich <cwzwarich@uwaterloo.ca>
Reviewed by Darin.
This tests for a crash when specifying multiple columns for a block with 0 content height.
<script>
if (window.layoutTestController)
layoutTestController.dumpAsText();
</script>
<p>
This tests for a crash when specifying multiple columns for a block with 0 content height.
</p>
<div style="height: 0; -webkit-column-count: 2;">
<div style="height: 50px; width: 100px;"></div>
</div>
2008-06-08 Dan Bernstein <mitz@apple.com>
Reviewed by Darin Adler.
- fix <rdar://problem/5961977> Crash in RenderBlock::layoutColumns()
Test: fast/multicol/content-height-zero-crash.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::layoutColumns): Changed to not keep creating
overflow columns that have zero height, because they do not help with
fitting content in.
2008-06-08 Adam Roben <aroben@apple.com>
Fix Bug 18837: Database panel fails to display tables if any value is
......@@ -3422,7 +3422,7 @@ int RenderBlock::layoutColumns(int endOfContent)
columnRects->append(colRect);
// Start adding in more columns as long as there's still content left.
if (currY < endOfContent && i == colCount - 1)
if (currY < endOfContent && i == colCount - 1 && (computeIntrinsicHeight || contentHeight()))
colCount++;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment