Commit 0676eebf authored by mitz@apple.com's avatar mitz@apple.com

WebCore:

        Reviewed by Darin Adler.

        - fix <rdar://problem/5914544> Crash in layoutInlineChildren()

        Test: fast/block/float/float-on-zero-height-line.html

        * rendering/RenderBlock.cpp:
        (WebCore::RenderBlock::markLinesDirtyInVerticalRange):

LayoutTests:

        Reviewed by Darin Adler.

        - test for <rdar://problem/5914544> Crash in layoutInlineChildren()

        * fast/block/float/float-on-zero-height-line.html: Added.
        * platform/mac/fast/block/float/float-on-zero-height-line-expected.checksum: Added.
        * platform/mac/fast/block/float/float-on-zero-height-line-expected.png: Added.
        * platform/mac/fast/block/float/float-on-zero-height-line-expected.txt: Added.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32945 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 96866fb1
2008-05-06 Dan Bernstein <mitz@apple.com>
Reviewed by Darin Adler.
- test for <rdar://problem/5914544> Crash in layoutInlineChildren()
* fast/block/float/float-on-zero-height-line.html: Added.
* platform/mac/fast/block/float/float-on-zero-height-line-expected.checksum: Added.
* platform/mac/fast/block/float/float-on-zero-height-line-expected.png: Added.
* platform/mac/fast/block/float/float-on-zero-height-line-expected.txt: Added.
2008-05-06 Adam Barth <abarth-webkit@adambarth.com>
Reviewed by Sam Weinig.
<div>
<div style="display: inline-block; height: 0; width: 50px;">
<div style="width: 50px; height: 50px; background-color: green;"></div>
</div>
<div id="float" style="float: left; height: 50px; width: 50px; background-color: red;"></div>
</div>
<script>
document.body.offsetTop;
document.getElementById("float").style.display = "none";
</script>
7c24eb9d66ff789d889ea113bb0b8a8e
\ No newline at end of file
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 784x0
RenderBlock {DIV} at (0,0) size 50x0
RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#008000]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
2008-05-06 Dan Bernstein <mitz@apple.com>
Reviewed by Darin Adler.
- fix <rdar://problem/5914544> Crash in layoutInlineChildren()
Test: fast/block/float/float-on-zero-height-line.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::markLinesDirtyInVerticalRange):
2008-05-06 Alice Liu <alice.liu@apple.com>
Reviewed by Adele Peterson and John Sullivan.
......@@ -2648,7 +2648,7 @@ void RenderBlock::markLinesDirtyInVerticalRange(int top, int bottom)
lowestDirtyLine = lowestDirtyLine->prevRootBox();
}
while (afterLowest && afterLowest->blockHeight() > top) {
while (afterLowest && afterLowest->blockHeight() >= top) {
afterLowest->markDirty();
afterLowest = afterLowest->prevRootBox();
}
......
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