Commit 0b521035 authored by andersr@opera.com's avatar andersr@opera.com

Convert fast/multicol/float-avoidance to reftest.

Changed column-width such that we're actually using more than one
column. Makes it easier to immediately visually verify that multicol is
being used.

Also changed text contents to be less sensitive to computed font size
across platforms.

R=mstensho@opera.com
BUG=386567

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

git-svn-id: svn://svn.chromium.org/blink/trunk@184281 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 5a17564b
......@@ -952,7 +952,6 @@ crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/column-rules-stacking
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/column-rules.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/float-avoidance.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/float-multicol.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/float-paginate-complex.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/float-paginate-empty-lines.html [ Skip ]
......@@ -1006,7 +1005,6 @@ crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/table-vertical-align.
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/unsplittable-inline-block.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-lr/border-padding-pagination.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-lr/column-rules.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-lr/float-avoidance.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-lr/float-multicol.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-lr/float-paginate-complex.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-lr/float-paginate.html [ Skip ]
......@@ -1016,7 +1014,6 @@ crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-lr/unsplitta
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-rl/border-padding-pagination.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-rl/break-properties.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-rl/column-rules.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-rl/float-avoidance.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-rl/float-multicol.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-rl/float-paginate-complex.html [ Skip ]
crbug.com/386567 virtual/regionbasedmulticol/fast/multicol/vertical-rl/float-paginate.html [ Skip ]
......@@ -1080,7 +1077,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-balance-2.html [ Skip ]
crbug.com/350853 fast/multicol/newmulticol/fixed-height-fill-balance.html [ Skip ]
crbug.com/350853 fast/multicol/newmulticol/float-avoidance.html [ Skip ]
crbug.com/350853 fast/multicol/newmulticol/float-multicol.html [ Skip ]
crbug.com/350853 fast/multicol/newmulticol/float-paginate-complex.html [ Skip ]
crbug.com/350853 fast/multicol/newmulticol/float-paginate-empty-lines.html [ Skip ]
......
<!DOCTYPE html>
<style>
.float {
float: left;
width: 200px;
height: 100px;
background-color: lime;
}
.multicol {
width: 400px;
border: 10px solid black;
line-height: 20px;
display: inline-block;
}
.multicol > div {
float: left;
width: 200px;
}
</style>
<div class="float">
</div>
<div class="multicol">
<div>
First column<br>
First column<br>
First column<br>
First column<br>
First column<br>
</div>
<div>
Second column<br>
Second column<br>
Second column<br>
Second column<br>
Second column<br>
</div>
</div>
\ No newline at end of file
<div style="float:left; width:200px; height:100px; background-color:lime"></div>
<div style="width:415px; -moz-column-width:200px; -webkit-column-width:200px;
text-align:justify; border:10px solid black">
<p>This technology preview of our award winning next generation browser
is a sign of things to come from Mozilla. Powerful yet easy to use. This
maintenance release provides a few updates based on user feedback - including
changes to the Extension System and icon improvements.
\ No newline at end of file
<!DOCTYPE html>
<style>
.float {
float: left;
width: 200px;
height: 100px;
background-color: lime;
}
.multicol {
width: 400px;
-webkit-column-width: 200px;
-webkit-column-gap: 0;
border: 10px solid black;
line-height: 20px;
}
</style>
<div class="float">
</div>
<div class="multicol">
First column<br>
First column<br>
First column<br>
First column<br>
First column<br>
Second column<br>
Second column<br>
Second column<br>
Second column<br>
Second column<br>
</div>
<body style="overflow:hidden">
<div style="float:left; width:200px; height:100px; background-color:lime"></div>
<div style="height:130px; width:415px; -moz-column-width:200px; -webkit-column-width:200px; column-width:200px; column-fill:auto;
text-align:justify; border:10px solid black">
<p>This technology preview of our award winning next generation browser
is a sign of things to come from Mozilla. Powerful yet easy to use. This
maintenance release provides a few updates based on user feedback - including
changes to the Extension System and icon improvements.
<body style="overflow:hidden">
<div style="float:left; width:200px; height:100px; background-color:lime"></div>
<div style="height:130px; width:415px; -moz-column-width:200px; -webkit-column-width:200px; column-width:200px; column-fill:auto;
text-align:justify; border:10px solid black">
<p>This technology preview of our award winning next generation browser
is a sign of things to come from Mozilla. Powerful yet easy to use. This
maintenance release provides a few updates based on user feedback - including
changes to the Extension System and icon improvements.
<!DOCTYPE html>
<style>
body {
-webkit-writing-mode: vertical-lr;
}
.float {
float: left;
width: 100px;
height: 200px;
background-color: lime;
}
.multicol {
height: 400px;
border: 10px solid black;
line-height: 20px;
display: inline-block;
vertical-align: bottom;
}
.multicol > div {
float: left;
height: 200px;
}
</style>
<div class="float">
</div>
<div class="multicol">
<div>
First column<br>
First column<br>
First column<br>
First column<br>
First column<br>
</div>
<div>
Second column<br>
Second column<br>
Second column<br>
Second column<br>
Second column<br>
</div>
</div>
\ No newline at end of file
<body style="-webkit-writing-mode:vertical-lr">
<div style="float:left; width:100px; height:200px; background-color:lime"></div>
<div style="height:415px; -moz-column-width:200px; -webkit-column-width:200px;
text-align:justify; border:10px solid black">
<p>This technology preview of our award winning next generation browser
is a sign of things to come from Mozilla. Powerful yet easy to use. This
maintenance release provides a few updates based on user feedback - including
changes to the Extension System and icon improvements.
\ No newline at end of file
<!DOCTYPE html>
<style>
body {
-webkit-writing-mode: vertical-lr;
}
.float {
float: left;
width: 100px;
height: 200px;
background-color: lime;
}
.multicol {
height: 400px;
-webkit-column-width: 200px;
-webkit-column-gap: 0;
border: 10px solid black;
line-height: 20px;
}
</style>
<div class="float">
</div>
<div class="multicol">
First column<br>
First column<br>
First column<br>
First column<br>
First column<br>
Second column<br>
Second column<br>
Second column<br>
Second column<br>
Second column<br>
</div>
<!DOCTYPE html>
<style>
body {
-webkit-writing-mode: vertical-rl;
}
.float {
float: left;
width: 100px;
height: 200px;
background-color: lime;
}
.multicol {
height: 400px;
border: 10px solid black;
line-height: 20px;
display: inline-block;
}
.multicol > div {
float: left;
height: 200px;
}
</style>
<div class="float">
</div>
<div class="multicol">
<div>
First column<br>
First column<br>
First column<br>
First column<br>
First column<br>
</div>
<div>
Second column<br>
Second column<br>
Second column<br>
Second column<br>
Second column<br>
</div>
</div>
\ No newline at end of file
<body style="-webkit-writing-mode:vertical-rl">
<div style="float:left; width:100px; height:200px; background-color:lime"></div>
<div style="height:415px; -moz-column-width:200px; -webkit-column-width:200px; column-width:200px; column-fill:auto;
text-align:justify; border:10px solid black">
<p>This technology preview of our award winning next generation browser
is a sign of things to come from Mozilla. Powerful yet easy to use. This
maintenance release provides a few updates based on user feedback - including
changes to the Extension System and icon improvements.
<!DOCTYPE html>
<style>
body {
-webkit-writing-mode: vertical-rl;
}
.float {
float: left;
width: 100px;
height: 200px;
background-color: lime;
}
.multicol {
height: 400px;
-webkit-column-width: 200px;
-webkit-column-gap: 0;
border: 10px solid black;
line-height: 20px;
}
</style>
<div class="float">
</div>
<div class="multicol">
First column<br>
First column<br>
First column<br>
First column<br>
First column<br>
Second column<br>
Second column<br>
Second column<br>
Second column<br>
Second column<br>
</div>
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 (floating) {DIV} at (0,0) size 200x100 [bgcolor=#00FF00]
layer at (208,8) size 435x152
RenderBlock {DIV} at (200,0) size 435x152 [border: (10px solid #000000)]
RenderBlock {P} at (10,26) size 415x100
RenderText {#text} at (0,0) size 415x99
text run at (0,0) width 415: "This technology preview of our award winning next generation"
text run at (0,20) width 55: "browser "
text run at (55,20) width 360: "is a sign of things to come from Mozilla. Powerful yet easy"
text run at (0,40) width 78: "to use. This "
text run at (78,40) width 337: "maintenance release provides a few updates based on"
text run at (0,60) width 158: "user feedback - including "
text run at (158,60) width 257: "changes to the Extension System and icon"
text run at (0,80) width 88: "improvements."
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 (floating) {DIV} at (0,0) size 100x200 [bgcolor=#00FF00]
layer at (108,8) size 152x435
RenderBlock {DIV} at (100,0) size 152x435 [border: (10px solid #000000)]
RenderBlock {P} at (26,10) size 100x415
RenderText {#text} at (0,0) size 99x415
text run at (0,0) width 415: "This technology preview of our award winning next generation"
text run at (20,0) width 55: "browser "
text run at (20,55) width 360: "is a sign of things to come from Mozilla. Powerful yet easy"
text run at (40,0) width 78: "to use. This "
text run at (40,78) width 337: "maintenance release provides a few updates based on"
text run at (60,0) width 158: "user feedback - including "
text run at (60,158) width 257: "changes to the Extension System and icon"
text run at (80,0) width 88: "improvements."
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 (floating) {DIV} at (0,0) size 100x200 [bgcolor=#00FF00]
layer at (540,8) size 152x435
RenderBlock {DIV} at (100,0) size 152x435 [border: (10px solid #000000)]
RenderBlock {P} at (26,10) size 100x415
RenderText {#text} at (0,0) size 99x415
text run at (0,0) width 415: "This technology preview of our award winning next generation"
text run at (20,0) width 55: "browser "
text run at (20,55) width 360: "is a sign of things to come from Mozilla. Powerful yet easy"
text run at (40,0) width 78: "to use. This "
text run at (40,78) width 337: "maintenance release provides a few updates based on"
text run at (60,0) width 158: "user feedback - including "
text run at (60,158) width 257: "changes to the Extension System and icon"
text run at (80,0) width 88: "improvements."
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 (floating) {DIV} at (0,0) size 200x100 [bgcolor=#00FF00]
layer at (208,8) size 435x132
RenderBlock {DIV} at (200,0) size 435x132 [border: (10px solid #000000)]
RenderBlock {P} at (10,26) size 415x80
RenderText {#text} at (0,0) size 415x80
text run at (0,0) width 415: "This technology preview of our award winning next generation"
text run at (0,16) width 57: "browser "
text run at (56,16) width 359: "is a sign of things to come from Mozilla. Powerful yet"
text run at (0,32) width 121: "easy to use. This "
text run at (120,32) width 295: "maintenance release provides a few updates"
text run at (0,48) width 246: "based on user feedback - including "
text run at (245,48) width 170: "changes to the Extension"
text run at (0,64) width 206: "System and icon improvements."
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 (floating) {DIV} at (0,0) size 100x200 [bgcolor=#00FF00]
layer at (108,8) size 132x435
RenderBlock {DIV} at (100,0) size 132x435 [border: (10px solid #000000)]
RenderBlock {P} at (26,10) size 80x415
RenderText {#text} at (0,0) size 80x415
text run at (0,0) width 415: "This technology preview of our award winning next generation"
text run at (16,0) width 57: "browser "
text run at (16,56) width 359: "is a sign of things to come from Mozilla. Powerful yet"
text run at (32,0) width 121: "easy to use. This "
text run at (32,120) width 295: "maintenance release provides a few updates"
text run at (48,0) width 246: "based on user feedback - including "
text run at (48,245) width 169: "changes to the Extension"
text run at (64,0) width 206: "System and icon improvements."
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 (floating) {DIV} at (0,0) size 100x200 [bgcolor=#00FF00]
layer at (560,8) size 132x435
RenderBlock {DIV} at (100,0) size 132x435 [border: (10px solid #000000)]
RenderBlock {P} at (26,10) size 80x415
RenderText {#text} at (0,0) size 80x415
text run at (0,0) width 415: "This technology preview of our award winning next generation"
text run at (16,0) width 57: "browser "
text run at (16,56) width 359: "is a sign of things to come from Mozilla. Powerful yet"
text run at (32,0) width 121: "easy to use. This "
text run at (32,120) width 295: "maintenance release provides a few updates"
text run at (48,0) width 246: "based on user feedback - including "
text run at (48,245) width 169: "changes to the Extension"
text run at (64,0) width 206: "System and icon improvements."
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 (floating) {DIV} at (0,0) size 200x100 [bgcolor=#00FF00]
layer at (208,8) size 435x152
RenderBlock {DIV} at (200,0) size 435x152 [border: (10px solid #000000)]
RenderBlock {P} at (10,26) size 415x100
RenderText {#text} at (0,0) size 415x99
text run at (0,0) width 415: "This technology preview of our award winning next generation"
text run at (0,20) width 55: "browser "
text run at (55,20) width 360: "is a sign of things to come from Mozilla. Powerful yet easy"
text run at (0,40) width 78: "to use. This "
text run at (78,40) width 337: "maintenance release provides a few updates based on"
text run at (0,60) width 158: "user feedback - including "
text run at (158,60) width 257: "changes to the Extension System and icon"
text run at (0,80) width 88: "improvements."
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 (floating) {DIV} at (0,0) size 100x200 [bgcolor=#00FF00]
layer at (108,8) size 152x435
RenderBlock {DIV} at (100,0) size 152x435 [border: (10px solid #000000)]
RenderBlock {P} at (26,10) size 100x415
RenderText {#text} at (0,0) size 99x415
text run at (0,0) width 415: "This technology preview of our award winning next generation"
text run at (20,0) width 55: "browser "
text run at (20,55) width 360: "is a sign of things to come from Mozilla. Powerful yet easy"
text run at (40,0) width 78: "to use. This "
text run at (40,78) width 337: "maintenance release provides a few updates based on"
text run at (60,0) width 158: "user feedback - including "
text run at (60,158) width 257: "changes to the Extension System and icon"
text run at (80,0) width 88: "improvements."
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 (floating) {DIV} at (0,0) size 100x200 [bgcolor=#00FF00]
layer at (540,8) size 152x435
RenderBlock {DIV} at (100,0) size 152x435 [border: (10px solid #000000)]
RenderBlock {P} at (26,10) size 100x415
RenderText {#text} at (0,0) size 99x415
text run at (0,0) width 415: "This technology preview of our award winning next generation"
text run at (20,0) width 55: "browser "
text run at (20,55) width 360: "is a sign of things to come from Mozilla. Powerful yet easy"
text run at (40,0) width 78: "to use. This "
text run at (40,78) width 337: "maintenance release provides a few updates based on"
text run at (60,0) width 158: "user feedback - including "
text run at (60,158) width 257: "changes to the Extension System and icon"
text run at (80,0) width 88: "improvements."
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 (floating) {DIV} at (0,0) size 200x100 [bgcolor=#00FF00]
layer at (208,8) size 435x142
RenderBlock {DIV} at (200,0) size 435x142 [border: (10px solid #000000)]
RenderBlock {P} at (10,26) size 415x90
RenderText {#text} at (0,0) size 415x89
text run at (0,0) width 415: "This technology preview of our award winning next generation"
text run at (0,18) width 57: "browser "
text run at (56,18) width 359: "is a sign of things to come from Mozilla. Powerful yet"
text run at (0,36) width 121: "easy to use. This "
text run at (120,36) width 295: "maintenance release provides a few updates"
text run at (0,54) width 246: "based on user feedback - including "
text run at (245,54) width 170: "changes to the Extension"
text run at (0,72) width 206: "System and icon improvements."
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 (floating) {DIV} at (0,0) size 100x200 [bgcolor=#00FF00]
layer at (108,8) size 142x435
RenderBlock {DIV} at (100,0) size 142x435 [border: (10px solid #000000)]
RenderBlock {P} at (26,10) size 90x415
RenderText {#text} at (0,0) size 89x415
text run at (0,0) width 415: "This technology preview of our award winning next generation"
text run at (18,0) width 57: "browser "
text run at (18,56) width 359: "is a sign of things to come from Mozilla. Powerful yet"
text run at (36,0) width 121: "easy to use. This "
text run at (36,120) width 295: "maintenance release provides a few updates"
text run at (54,0) width 246: "based on user feedback - including "
text run at (54,245) width 169: "changes to the Extension"
text run at (72,0) width 206: "System and icon improvements."
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 (floating) {DIV} at (0,0) size 100x200 [bgcolor=#00FF00]
layer at (550,8) size 142x435
RenderBlock {DIV} at (100,0) size 142x435 [border: (10px solid #000000)]
RenderBlock {P} at (26,10) size 90x415
RenderText {#text} at (0,0) size 89x415
text run at (0,0) width 415: "This technology preview of our award winning next generation"
text run at (18,0) width 57: "browser "
text run at (18,56) width 359: "is a sign of things to come from Mozilla. Powerful yet"
text run at (36,0) width 121: "easy to use. This "
text run at (36,120) width 295: "maintenance release provides a few updates"
text run at (54,0) width 246: "based on user feedback - including "
text run at (54,245) width 169: "changes to the Extension"
text run at (72,0) width 206: "System and icon improvements."
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