| Index: LayoutTests/fast/multicol/float-paginate-empty-lines.html
|
| diff --git a/LayoutTests/fast/multicol/float-paginate-empty-lines.html b/LayoutTests/fast/multicol/float-paginate-empty-lines.html
|
| index adeb331094e31b4dad559a5dbb46b9c9e3d802e2..20d4c7a089362583c20a5b20642adee4e260df29 100644
|
| --- a/LayoutTests/fast/multicol/float-paginate-empty-lines.html
|
| +++ b/LayoutTests/fast/multicol/float-paginate-empty-lines.html
|
| @@ -1,11 +1,31 @@
|
| +<!DOCTYPE html>
|
| +<style>
|
| + .columns {
|
| + -webkit-column-count: 2;
|
| + -webkit-column-gap: 0px;
|
| + column-fill: auto;
|
| + height: 300px;
|
| + border: 2px solid black;
|
| + line-height: 20px;
|
| + }
|
| + .dashed {
|
| + border: 10px dashed maroon;
|
| + }
|
| + img {
|
| + float: right;
|
| + width: 100px;
|
| + height: 200px;
|
| + background-color: #cccccc;
|
| + }
|
| +</style>
|
| <p>This test is ensuring we don't grow the height of a block improperly when a float has no line association (e.g., when it's at the end of a
|
| block). The complete dashed border should be in the first column, with none of it appearing in the second column.</p>
|
| -
|
| -<div style="-moz-column-width:300px; -webkit-column-width:300px; column-width:300px; column-fill:auto; height:400px">
|
| -<div style="border:10px dashed maroon">
|
| -This is some text.<br>
|
| -This is some text.<br>This is some text.<br>This is some text.<br>This is some text.<br>This is some text.<br>This is some text.<br>
|
| -This is some text.<br>This is some text.<br>This is some text.<br>This is some text.<br>
|
| -This is some text.<br>
|
| -<img style="float:right;width:100px;height:200px;background-color:#cccccc">
|
| -</div>
|
| +<div class="columns">
|
| + <div class="dashed">
|
| + This is some text.<br>This is some text.<br>This is some text.<br>
|
| + This is some text.<br>This is some text.<br>This is some text.<br>
|
| + This is some text.<br>This is some text.<br>This is some text.<br>
|
| + This is some text.<br>This is some text.<br>This is some text.<br>
|
| + <img>
|
| + </div>
|
| +</div>
|
|
|