Convert overflow-in-uniform-regions to a reftest

https://bugs.webkit.org/show_bug.cgi?id=74765

Replaced the bitmap version of the test with a "reftest" version.   Use of text
has been revised a little to mitigate the possibility that small differences in
the platform's default font will change the location of line breaks.

Patch by Hans Muller <hmuller@adobe.com> on 2012-01-06
Reviewed by Anders Carlsson.

* fast/regions/overflow-in-uniform-regions-expected.html: Added.
* fast/regions/overflow-in-uniform-regions.html:
* platform/efl/fast/regions/overflow-in-uniform-regions-expected.png: Removed.
* platform/efl/fast/regions/overflow-in-uniform-regions-expected.txt: Removed.
* platform/mac/fast/regions/overflow-in-uniform-regions-expected.png: Removed.
* platform/mac/fast/regions/overflow-in-uniform-regions-expected.txt: Removed.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@104314 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d7bf4b0c
2012-01-06 Hans Muller <hmuller@adobe.com>
Convert overflow-in-uniform-regions to a reftest
https://bugs.webkit.org/show_bug.cgi?id=74765
Replaced the bitmap version of the test with a "reftest" version. Use of text
has been revised a little to mitigate the possibility that small differences in
the platform's default font will change the location of line breaks.
Reviewed by Anders Carlsson.
* fast/regions/overflow-in-uniform-regions-expected.html: Added.
* fast/regions/overflow-in-uniform-regions.html:
* platform/efl/fast/regions/overflow-in-uniform-regions-expected.png: Removed.
* platform/efl/fast/regions/overflow-in-uniform-regions-expected.txt: Removed.
* platform/mac/fast/regions/overflow-in-uniform-regions-expected.png: Removed.
* platform/mac/fast/regions/overflow-in-uniform-regions-expected.txt: Removed.
2012-01-06 Tony Chang <tony@chromium.org>
Need to relayout when stretching the height of a flex item
<!doctype html>
<style>
html {
line-height: 18px;
}
#content {
text-align: justify;
padding: 5px;
}
#first-box {
border: 1px solid blue;
padding:5px;
}
#second-box {
border: 1px solid green;
overflow: hidden;
}
#content-two {
text-align: justify;
padding-left: 5px;
padding-right: 5px;
}
#first-box-two {
border: 1px solid blue;
padding:5px;
border-top: none;
padding-top: 0;
}
#second-box-two {
border: 1px solid green;
height: 85px;
border-top: none;
padding-top: 0;
}
#region1, #region2, #region3 {
border: 1px solid black;
}
#region1 {
width: 400px;
height: 143px;
overflow:hidden;
}
#region2 {
width: 400px;
height: 150px;
overflow:hidden;
}
#region3 {
width: 400px;
height: 150px;
}
.float { width:30px; height:50px; background-color: lime }
.left { float: left }
.right { float: right }
</style>
<body>
<p>The first and last lines of text in the regions below should be clipped to the green box. The overflow
section sizes itself and clips differently in each region. The green box should be even with the lime floats at the top of the first region.</p>
<div id="container">
<div id="region1">
<div id="content">
<div id="first-box">
<div class="float left"></div> <div class="float right"></div>
<div id="second-box">
<p>This is a paragraph that spans more than one line but less than three lines.</p>
<p>1<br>2<br>3<br>
</div>
</div>
</div>
</div>
<div id="region2">
<div id="content-two">
<div id="first-box-two">
<div id="second-box-two">
4<br>This paragraph spans three lines in region1 and then flows into three lines in region2.
</div>
</div>
</div>
</div>
<div id="region3"></div>
</div>
<!doctype html>
<style>
html {
line-height: 18px;
}
#content {
-webkit-flow-into: flow1;
text-align: justify;
......@@ -15,6 +19,7 @@
#second-box {
border: 1px solid green;
overflow:hidden;
height: 216px; /* 12 * line-height */
}
#region1, #region2, #region3 {
......@@ -24,7 +29,7 @@
#region1 {
width: 400px;
height: 150px;
height: 143px;
}
#region2 {
......@@ -50,10 +55,8 @@ section sizes itself and clips differently in each region. The green box should
<div id="first-box">
<div class="float left"></div> <div class="float right"></div>
<div id="second-box">
<p>These lines will not spill out of the regions. These lines will not spill out of the regions.
These lines will not spill out of the regions. These lines will not spill out of the regions. </p>
<p>These lines will not spill out of the regions. These lines will not spill out of the regions.
These lines will not spill out of the regions. These lines will not spill out of the regions. </p>
<p>This is a paragraph that spans more than one line but less than three lines.</p>
<p>1<br>2<br>3<br>4<br>This paragraph spans three lines in region1 and then flows into three lines in region2.</p>
</div>
</div>
</div>
......
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x534
RenderBlock {HTML} at (0,0) size 800x534
RenderBody {BODY} at (8,16) size 784x510
RenderBlock {P} at (0,0) size 784x38
RenderText {#text} at (0,0) size 772x38
text run at (0,0) width 772: "The first and last lines of text in the regions below should be clipped to the green box. The overflow section sizes itself and"
text run at (0,19) width 692: "clips differently in each region. The green box should be even with the lime floats at the top of the first region."
RenderBlock {DIV} at (0,54) size 784x456
RenderRegion {DIV} at (0,0) size 402x152 [border: (1px solid #000000)]
RenderRegion {DIV} at (0,152) size 402x152 [border: (1px solid #000000)]
RenderRegion {DIV} at (0,304) size 402x152 [border: (1px solid #000000)]
Flow Threads
Thread with flow-name 'flow1'
layer at (0,0) size 400x450
RenderFlowThread at (0,0) size 400x450
RenderBlock {DIV} at (0,0) size 400x235
RenderBlock {DIV} at (5,5) size 390x225 [border: (1px solid #0000FF)]
RenderBlock (floating) {DIV} at (6,6) size 30x50 [bgcolor=#00FF00]
RenderBlock (floating) {DIV} at (354,6) size 30x50 [bgcolor=#00FF00]
layer at (11,11) size 378x213 clip at (12,12) size 376x211
RenderBlock {DIV} at (6,6) size 378x213 [border: (1px solid #008000)]
RenderBlock {P} at (1,17) size 376x76
RenderText {#text} at (30,0) size 316x76
text run at (30,0) width 316: "These lines will not spill out of the regions. These"
text run at (30,19) width 243: "lines will not spill out of the regions. "
text run at (273,19) width 73: "These lines"
text run at (30,38) width 316: "will not spill out of the regions. These lines will"
text run at (30,57) width 168: "not spill out of the regions."
RenderBlock {P} at (1,109) size 376x87
RenderText {#text} at (30,0) size 376x87
text run at (30,0) width 316: "These lines will not spill out of the regions. These"
text run at (0,30) width 247: "lines will not spill out of the regions. "
text run at (247,30) width 129: "These lines will not"
text run at (0,49) width 376: "spill out of the regions. These lines will not spill out of the"
text run at (0,68) width 50: "regions."
Regions for flow 'flow1'
RenderRegion {DIV} #region1
RenderRegion {DIV} #region2
RenderRegion {DIV} #region3
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x532
RenderBlock {HTML} at (0,0) size 800x532
RenderBody {BODY} at (8,16) size 784x508
RenderBlock {P} at (0,0) size 784x36
RenderText {#text} at (0,0) size 772x36
text run at (0,0) width 772: "The first and last lines of text in the regions below should be clipped to the green box. The overflow section sizes itself and"
text run at (0,18) width 692: "clips differently in each region. The green box should be even with the lime floats at the top of the first region."
RenderBlock {DIV} at (0,52) size 784x456
RenderRegion {DIV} at (0,0) size 402x152 [border: (1px solid #000000)]
RenderRegion {DIV} at (0,152) size 402x152 [border: (1px solid #000000)]
RenderRegion {DIV} at (0,304) size 402x152 [border: (1px solid #000000)]
Flow Threads
Thread with flow-name 'flow1'
layer at (0,0) size 400x450
RenderFlowThread at (0,0) size 400x450
RenderBlock {DIV} at (0,0) size 400x232
RenderBlock {DIV} at (5,5) size 390x222 [border: (1px solid #0000FF)]
RenderBlock (floating) {DIV} at (6,6) size 30x50 [bgcolor=#00FF00]
RenderBlock (floating) {DIV} at (354,6) size 30x50 [bgcolor=#00FF00]
layer at (11,11) size 378x210 clip at (12,12) size 376x208
RenderBlock {DIV} at (6,6) size 378x210 [border: (1px solid #008000)]
RenderBlock {P} at (1,17) size 376x72
RenderText {#text} at (30,0) size 316x72
text run at (30,0) width 316: "These lines will not spill out of the regions. These"
text run at (30,18) width 243: "lines will not spill out of the regions. "
text run at (273,18) width 73: "These lines"
text run at (30,36) width 316: "will not spill out of the regions. These lines will"
text run at (30,54) width 168: "not spill out of the regions."
RenderBlock {P} at (1,105) size 376x88
RenderText {#text} at (30,0) size 376x88
text run at (30,0) width 316: "These lines will not spill out of the regions. These"
text run at (0,34) width 247: "lines will not spill out of the regions. "
text run at (247,34) width 129: "These lines will not"
text run at (0,52) width 376: "spill out of the regions. These lines will not spill out of the"
text run at (0,70) width 50: "regions."
Regions for flow 'flow1'
RenderRegion {DIV} #region1
RenderRegion {DIV} #region2
RenderRegion {DIV} #region3
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