Skip to content

GitLab

T
tangled
Commit afcef0d0 authored by andersr@opera.com's avatar andersr@opera.com
Browse files
Options

Convert fast/multicol/float-paginate-empty-lines to reftest. 

 * Set 'column-gap: 0'.
 * Reduced height to 300px to make it more visually obvious that the float
   does not fit in first column.
 * Removed evil twin in newmulticol.

R=mstensho@opera.com
BUG=386567

Review URL: https://codereview.chromium.org/702853003

git-svn-id: svn://svn.chromium.org/blink/trunk@185455 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 32890597
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 237 deletions
third_party/WebKit/LayoutTests/TestExpectations
View file @ afcef0d0
...@@ -906,7 +906,6 @@ crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/border-padding-pagina ...@@ -906,7 +906,6 @@ crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/border-padding-pagina
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/column-rules-stacking.html [ Skip ] crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/column-rules-stacking.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode.html [ Skip ] crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/flipped-blocks-hit-test.html [ Skip ] crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/flipped-blocks-hit-test.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/float-paginate-empty-lines.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/hit-test-above-or-below.html [ Skip ] crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/hit-test-above-or-below.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/hit-test-end-of-column-with-line-height.html [ Skip ] crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/hit-test-end-of-column-with-line-height.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/hit-test-end-of-column.html [ Skip ] crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/hit-test-end-of-column.html [ Skip ]
...@@ -1007,7 +1006,6 @@ crbug.com/350853 fast/multicol/newmulticol/direct-child-column-span-all.html [ S ...@@ -1007,7 +1006,6 @@ crbug.com/350853 fast/multicol/newmulticol/direct-child-column-span-all.html [ S
crbug.com/350853 fast/multicol/newmulticol/fixed-height-fill-auto.html [ Skip ] crbug.com/350853 fast/multicol/newmulticol/fixed-height-fill-auto.html [ Skip ]
crbug.com/350853 fast/multicol/newmulticol/fixed-height-fill-balance-2.html [ Skip ] crbug.com/350853 fast/multicol/newmulticol/fixed-height-fill-balance-2.html [ Skip ]
crbug.com/350853 fast/multicol/newmulticol/fixed-height-fill-balance.html [ Skip ] crbug.com/350853 fast/multicol/newmulticol/fixed-height-fill-balance.html [ Skip ]
crbug.com/350853 fast/multicol/newmulticol/float-paginate-empty-lines.html [ Skip ]
crbug.com/350853 fast/multicol/newmulticol/hide-box-horizontal-bt.html [ Skip ] crbug.com/350853 fast/multicol/newmulticol/hide-box-horizontal-bt.html [ Skip ]
crbug.com/350853 fast/multicol/newmulticol/hide-box-vertical-lr.html [ Skip ] crbug.com/350853 fast/multicol/newmulticol/hide-box-vertical-lr.html [ Skip ]
crbug.com/350853 fast/multicol/newmulticol/hide-box-vertical-rl.html [ Skip ] crbug.com/350853 fast/multicol/newmulticol/hide-box-vertical-rl.html [ Skip ]
......
third_party/WebKit/LayoutTests/fast/multicol/float-paginate-empty-lines-expected.html 0 → 100644
View file @ afcef0d0
<!DOCTYPE html>
<style>
.columns {
height: 300px;
border: 2px solid black;
line-height: 20px;
}
.dashed {
border: 10px dashed maroon;
width: 50%;
float: left;
box-sizing: border-box;
}
img {
float: right;
width: 100px;
height: 200px;
background-color: #cccccc;
margin-right: 10px;
}
</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 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>
</div>
<img>
</div>
\ No newline at end of file
third_party/WebKit/LayoutTests/fast/multicol/float-paginate-empty-lines.html
View file @ afcef0d0
<!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 <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> block). The complete dashed border should be in the first column, with none of it appearing in the second column.</p>
<div class="columns">
<div style="-moz-column-width:300px; -webkit-column-width:300px; column-width:300px; column-fill:auto; height:400px"> <div class="dashed">
<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>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>
<img style="float:right;width:100px;height:200px;background-color:#cccccc"> </div>
</div> </div>
\ No newline at end of file
third_party/WebKit/LayoutTests/fast/multicol/newmulticol/float-paginate-empty-lines-expected.html deleted 100644 → 0
View file @ 32890597
<body style="overflow:hidden">
<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>
third_party/WebKit/LayoutTests/fast/multicol/newmulticol/float-paginate-empty-lines.html deleted 100644 → 0
View file @ 32890597
<body style="overflow:hidden">
<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>
third_party/WebKit/LayoutTests/platform/linux/fast/multicol/float-paginate-empty-lines-expected.txt deleted 100644 → 0
View file @ 32890597
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 {P} at (0,0) size 784x40
RenderText {#text} at (0,0) size 770x39
text run at (0,0) width 770: "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"
text run at (0,20) width 709: "of a block). The complete dashed border should be in the first column, with none of it appearing in the second column."
layer at (8,64) size 784x400
RenderBlock {DIV} at (0,56) size 784x400
RenderBlock {DIV} at (0,0) size 384x260 [border: (10px dashed #800000)]
RenderText {#text} at (10,10) size 104x19
text run at (10,10) width 104: "This is some text."
RenderBR {BR} at (114,25) size 0x0
RenderText {#text} at (10,30) size 104x19
text run at (10,30) width 104: "This is some text."
RenderBR {BR} at (114,45) size 0x0
RenderText {#text} at (10,50) size 104x19
text run at (10,50) width 104: "This is some text."
RenderBR {BR} at (114,65) size 0x0
RenderText {#text} at (10,70) size 104x19
text run at (10,70) width 104: "This is some text."
RenderBR {BR} at (114,85) size 0x0
RenderText {#text} at (10,90) size 104x19
text run at (10,90) width 104: "This is some text."
RenderBR {BR} at (114,105) size 0x0
RenderText {#text} at (10,110) size 104x19
text run at (10,110) width 104: "This is some text."
RenderBR {BR} at (114,125) size 0x0
RenderText {#text} at (10,130) size 104x19
text run at (10,130) width 104: "This is some text."
RenderBR {BR} at (114,145) size 0x0
RenderText {#text} at (10,150) size 104x19
text run at (10,150) width 104: "This is some text."
RenderBR {BR} at (114,165) size 0x0
RenderText {#text} at (10,170) size 104x19
text run at (10,170) width 104: "This is some text."
RenderBR {BR} at (114,185) size 0x0
RenderText {#text} at (10,190) size 104x19
text run at (10,190) width 104: "This is some text."
RenderBR {BR} at (114,205) size 0x0
RenderText {#text} at (10,210) size 104x19
text run at (10,210) width 104: "This is some text."
RenderBR {BR} at (114,225) size 0x0
RenderText {#text} at (10,230) size 104x19
text run at (10,230) width 104: "This is some text."
RenderBR {BR} at (114,245) size 0x0
RenderImage {IMG} at (274,400) size 100x200 [bgcolor=#CCCCCC]
RenderText {#text} at (0,0) size 0x0
third_party/WebKit/LayoutTests/platform/mac/fast/multicol/float-paginate-empty-lines-expected.txt deleted 100644 → 0
View file @ 32890597
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 {P} at (0,0) size 784x48
RenderText {#text} at (0,0) size 779x48
text run at (0,0) width 779: "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"
text run at (0,16) width 755: "the end of a block). The complete dashed border should be in the first column, with none of it appearing in the second"
text run at (0,32) width 52: "column."
layer at (8,72) size 784x400
RenderBlock {DIV} at (0,64) size 784x400
RenderBlock {DIV} at (0,0) size 384x212 [border: (10px dashed #800000)]
RenderText {#text} at (10,10) size 113x16
text run at (10,10) width 113: "This is some text."
RenderBR {BR} at (122,22) size 1x0
RenderText {#text} at (10,26) size 113x16
text run at (10,26) width 113: "This is some text."
RenderBR {BR} at (122,38) size 1x0
RenderText {#text} at (10,42) size 113x16
text run at (10,42) width 113: "This is some text."
RenderBR {BR} at (122,54) size 1x0
RenderText {#text} at (10,58) size 113x16
text run at (10,58) width 113: "This is some text."
RenderBR {BR} at (122,70) size 1x0
RenderText {#text} at (10,74) size 113x16
text run at (10,74) width 113: "This is some text."
RenderBR {BR} at (122,86) size 1x0
RenderText {#text} at (10,90) size 113x16
text run at (10,90) width 113: "This is some text."
RenderBR {BR} at (122,102) size 1x0
RenderText {#text} at (10,106) size 113x16
text run at (10,106) width 113: "This is some text."
RenderBR {BR} at (122,118) size 1x0
RenderText {#text} at (10,122) size 113x16
text run at (10,122) width 113: "This is some text."
RenderBR {BR} at (122,134) size 1x0
RenderText {#text} at (10,138) size 113x16
text run at (10,138) width 113: "This is some text."
RenderBR {BR} at (122,150) size 1x0
RenderText {#text} at (10,154) size 113x16
text run at (10,154) width 113: "This is some text."
RenderBR {BR} at (122,166) size 1x0
RenderText {#text} at (10,170) size 113x16
text run at (10,170) width 113: "This is some text."
RenderBR {BR} at (122,182) size 1x0
RenderText {#text} at (10,186) size 113x16
text run at (10,186) width 113: "This is some text."
RenderBR {BR} at (122,198) size 1x0
RenderImage {IMG} at (274,400) size 100x200 [bgcolor=#CCCCCC]
RenderText {#text} at (0,0) size 0x0
third_party/WebKit/LayoutTests/platform/win-xp/fast/multicol/float-paginate-empty-lines-expected.txt deleted 100644 → 0
View file @ 32890597
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 {P} at (0,0) size 784x40
RenderText {#text} at (0,0) size 770x39
text run at (0,0) width 770: "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"
text run at (0,20) width 709: "of a block). The complete dashed border should be in the first column, with none of it appearing in the second column."
layer at (8,64) size 784x400
RenderBlock {DIV} at (0,56) size 784x400
RenderBlock {DIV} at (0,0) size 384x260 [border: (10px dashed #800000)]
RenderText {#text} at (10,10) size 104x19
text run at (10,10) width 104: "This is some text."
RenderBR {BR} at (114,25) size 0x0
RenderText {#text} at (10,30) size 104x19
text run at (10,30) width 104: "This is some text."
RenderBR {BR} at (114,45) size 0x0
RenderText {#text} at (10,50) size 104x19
text run at (10,50) width 104: "This is some text."
RenderBR {BR} at (114,65) size 0x0
RenderText {#text} at (10,70) size 104x19
text run at (10,70) width 104: "This is some text."
RenderBR {BR} at (114,85) size 0x0
RenderText {#text} at (10,90) size 104x19
text run at (10,90) width 104: "This is some text."
RenderBR {BR} at (114,105) size 0x0
RenderText {#text} at (10,110) size 104x19
text run at (10,110) width 104: "This is some text."
RenderBR {BR} at (114,125) size 0x0
RenderText {#text} at (10,130) size 104x19
text run at (10,130) width 104: "This is some text."
RenderBR {BR} at (114,145) size 0x0
RenderText {#text} at (10,150) size 104x19
text run at (10,150) width 104: "This is some text."
RenderBR {BR} at (114,165) size 0x0
RenderText {#text} at (10,170) size 104x19
text run at (10,170) width 104: "This is some text."
RenderBR {BR} at (114,185) size 0x0
RenderText {#text} at (10,190) size 104x19
text run at (10,190) width 104: "This is some text."
RenderBR {BR} at (114,205) size 0x0
RenderText {#text} at (10,210) size 104x19
text run at (10,210) width 104: "This is some text."
RenderBR {BR} at (114,225) size 0x0
RenderText {#text} at (10,230) size 104x19
text run at (10,230) width 104: "This is some text."
RenderBR {BR} at (114,245) size 0x0
RenderImage {IMG} at (274,400) size 100x200 [bgcolor=#CCCCCC]
RenderText {#text} at (0,0) size 0x0
third_party/WebKit/LayoutTests/platform/win/fast/multicol/float-paginate-empty-lines-expected.txt deleted 100644 → 0
View file @ 32890597
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 {P} at (0,0) size 784x54
RenderText {#text} at (0,0) size 779x53
text run at (0,0) width 779: "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"
text run at (0,18) width 755: "the end of a block). The complete dashed border should be in the first column, with none of it appearing in the second"
text run at (0,36) width 52: "column."
layer at (8,78) size 784x400
RenderBlock {DIV} at (0,70) size 784x400
RenderBlock {DIV} at (0,0) size 384x236 [border: (10px dashed #800000)]
RenderText {#text} at (10,10) size 113x17
text run at (10,10) width 113: "This is some text."
RenderBR {BR} at (122,24) size 1x0
RenderText {#text} at (10,28) size 113x17
text run at (10,28) width 113: "This is some text."
RenderBR {BR} at (122,42) size 1x0
RenderText {#text} at (10,46) size 113x17
text run at (10,46) width 113: "This is some text."
RenderBR {BR} at (122,60) size 1x0
RenderText {#text} at (10,64) size 113x17
text run at (10,64) width 113: "This is some text."
RenderBR {BR} at (122,78) size 1x0
RenderText {#text} at (10,82) size 113x17
text run at (10,82) width 113: "This is some text."
RenderBR {BR} at (122,96) size 1x0
RenderText {#text} at (10,100) size 113x17
text run at (10,100) width 113: "This is some text."
RenderBR {BR} at (122,114) size 1x0
RenderText {#text} at (10,118) size 113x17
text run at (10,118) width 113: "This is some text."
RenderBR {BR} at (122,132) size 1x0
RenderText {#text} at (10,136) size 113x17
text run at (10,136) width 113: "This is some text."
RenderBR {BR} at (122,150) size 1x0
RenderText {#text} at (10,154) size 113x17
text run at (10,154) width 113: "This is some text."
RenderBR {BR} at (122,168) size 1x0
RenderText {#text} at (10,172) size 113x17
text run at (10,172) width 113: "This is some text."
RenderBR {BR} at (122,186) size 1x0
RenderText {#text} at (10,190) size 113x17
text run at (10,190) width 113: "This is some text."
RenderBR {BR} at (122,204) size 1x0
RenderText {#text} at (10,208) size 113x17
text run at (10,208) width 113: "This is some text."
RenderBR {BR} at (122,222) size 1x0
RenderImage {IMG} at (274,400) size 100x200 [bgcolor=#CCCCCC]
RenderText {#text} at (0,0) size 0x0
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