Diff
Modified: trunk/LayoutTests/ChangeLog (110488 => 110489)
--- trunk/LayoutTests/ChangeLog 2012-03-12 22:22:59 UTC (rev 110488)
+++ trunk/LayoutTests/ChangeLog 2012-03-12 22:24:39 UTC (rev 110489)
@@ -1,3 +1,18 @@
+2012-03-12 Rebecca Hauck <[email protected]>
+
+ Convert some fast/regions pixel tests to reftests
+ https://bugs.webkit.org/show_bug.cgi?id=79132
+
+ Reviewed by Dirk Schulze.
+
+ * fast/regions/floats-basic-in-variable-width-regions-expected.html: Added.
+ * fast/regions/floats-basic-in-variable-width-regions.html:
+ * platform/chromium/test_expectations.txt:
+ * platform/efl/fast/regions/floats-basic-in-variable-width-regions-expected.png: Removed.
+ * platform/efl/fast/regions/floats-basic-in-variable-width-regions-expected.txt: Removed.
+ * platform/mac/fast/regions/floats-basic-in-variable-width-regions-expected.png: Removed.
+ * platform/mac/fast/regions/floats-basic-in-variable-width-regions-expected.txt: Removed.
+
2012-03-12 Abhishek Arya <[email protected]>
Crash in Text::splitText due to mutation events.
Added: trunk/LayoutTests/fast/regions/floats-basic-in-variable-width-regions-expected.html (0 => 110489)
--- trunk/LayoutTests/fast/regions/floats-basic-in-variable-width-regions-expected.html (rev 0)
+++ trunk/LayoutTests/fast/regions/floats-basic-in-variable-width-regions-expected.html 2012-03-12 22:24:39 UTC (rev 110489)
@@ -0,0 +1,90 @@
+<!doctype html>
+
+ <style>
+
+ #blue-box-1 {
+ border: 1px solid blue;
+ }
+
+ #blue-box-2 {
+ border-bottom: 1px solid blue;
+ border-left: 1px solid blue;
+ border-right: 1px solid blue;
+ }
+
+ #green-box-1 {
+ margin:auto;
+ border: 1px solid green;
+ padding-bottom:1px;
+ width:75%
+ }
+
+ #green-box-2 {
+ margin:auto;
+ border-bottom: 1px solid green;
+ border-left: 1px solid green;
+ border-right: 1px solid green;
+ width:75%
+ }
+
+ #region1, #region2, #region3 {
+ border: 1px solid black;
+ }
+
+ #region1 {
+ width: 290px;
+ height: 95px;
+ padding-top:5px;
+ padding-left:5px;
+ padding-right:5px;
+ overflow:hidden;
+ }
+
+ #region2 {
+ width: 390px;
+ height: 180px;
+ padding-left:5px;
+ padding-right:5px;
+ }
+
+ #region3 {
+ width: 220px;
+ height: 120px;
+ }
+
+ .float {
+ width:50px;
+ 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.</p>-->
+<div id="region1">
+ <div id="blue-box-1">
+ <div id="green-box-1">
+ <div class="float left"></div> <div class="float right"></div>
+ <p>These lines will not spill out of the regions. These lines will not spill out</p>
+ </div>
+ </div>
+</div>
+<div id="region2">
+ <div id="blue-box-2">
+ <div id="green-box-2">
+ of the regions. These lines will not spill out of the regions. These lines will not spill out of the regions.
+ <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>
+ </div>
+ </div>
+</div>
+<div id="region3"></div>
Property changes on: trunk/LayoutTests/fast/regions/floats-basic-in-variable-width-regions-expected.html
___________________________________________________________________
Added: svn:executable
Modified: trunk/LayoutTests/fast/regions/floats-basic-in-variable-width-regions.html (110488 => 110489)
--- trunk/LayoutTests/fast/regions/floats-basic-in-variable-width-regions.html 2012-03-12 22:22:59 UTC (rev 110488)
+++ trunk/LayoutTests/fast/regions/floats-basic-in-variable-width-regions.html 2012-03-12 22:24:39 UTC (rev 110489)
@@ -3,7 +3,6 @@
<style>
#content {
-webkit-flow-into: flow1;
- text-align: justify;
padding: 5px;
}
@@ -49,10 +48,10 @@
<div id="first-box">
<div id="second-box">
<div class="float left"></div> <div class="float right"></div>
+ <p>These lines will not spill out of the regions. These lines will not spill out </p>
+ <p>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>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>
</div>
</div>
</div>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (110488 => 110489)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-03-12 22:22:59 UTC (rev 110488)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-03-12 22:24:39 UTC (rev 110489)
@@ -3036,7 +3036,6 @@
// Need to evaluate and update regions and exclusions tests.
BUGWK74137 : fast/regions/bottom-overflow-out-of-first-region.html = PASS FAIL MISSING
-BUGWK74137 : fast/regions/floats-basic-in-variable-width-regions.html = PASS FAIL MISSING
BUGWK74137 : fast/regions/flow-content-basic-vertical-rl.html = PASS FAIL MISSING
BUGWK74137 : fast/regions/flow-content-basic-vertical.html = PASS FAIL MISSING
BUGWK74137 : fast/regions/flow-content-basic.html = PASS FAIL MISSING
Deleted: trunk/LayoutTests/platform/efl/fast/regions/floats-basic-in-variable-width-regions-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/efl/fast/regions/floats-basic-in-variable-width-regions-expected.txt (110488 => 110489)
--- trunk/LayoutTests/platform/efl/fast/regions/floats-basic-in-variable-width-regions-expected.txt 2012-03-12 22:22:59 UTC (rev 110488)
+++ trunk/LayoutTests/platform/efl/fast/regions/floats-basic-in-variable-width-regions-expected.txt 2012-03-12 22:24:39 UTC (rev 110489)
@@ -1,37 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x422
- RenderBlock {HTML} at (0,0) size 800x422
- RenderBody {BODY} at (8,8) size 784x406
- RenderBlock {DIV} at (0,0) size 784x406
- RenderRegion {DIV} at (0,0) size 302x102 [border: (1px solid #000000)]
- RenderRegion {DIV} at (0,102) size 402x182 [border: (1px solid #000000)]
- RenderRegion {DIV} at (0,284) size 222x122 [border: (1px solid #000000)]
-Flow Threads
- Thread with flow-name 'flow1'
- layer at (0,0) size 400x400
- RenderFlowThread at (0,0) size 400x400
- RenderBlock {DIV} at (0,0) size 400x247
- RenderBlock {DIV} at (5,5) size 390x237 [border: (1px solid #0000FF)]
- RenderBlock {DIV} at (48,1) size 293x235 [border: (1px solid #008000)]
- RenderBlock (floating) {DIV} at (-11,1) size 50x50 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (155,1) size 50x50 [bgcolor=#00FF00]
- RenderBlock {P} at (1,17) size 291x113
- RenderText {#text} at (38,0) size 303x114
- text run at (38,0) width 116: "These lines will"
- text run at (38,18) width 116: "not spill out of the"
- text run at (-12,36) width 216: "regions. These lines will not spill"
- text run at (-12,54) width 139: "out of the regions. "
- text run at (127,54) width 77: "These lines"
- text run at (0,77) width 291: "will not spill out of the regions. These lines"
- text run at (0,95) width 196: "will not spill out of the regions."
- RenderBlock {P} at (1,146) size 291x72
- RenderText {#text} at (0,0) size 291x73
- text run at (0,0) width 291: "These lines will not spill out of the regions."
- text run at (0,18) width 291: "These lines will not spill out of the regions."
- text run at (0,36) width 291: "These lines will not spill out of the regions."
- text run at (0,54) width 271: "These lines will not spill out of the regions."
- Regions for flow 'flow1'
- RenderRegion {DIV} #region1
- RenderRegion {DIV} #region2
- RenderRegion {DIV} #region3
Deleted: trunk/LayoutTests/platform/mac/fast/regions/floats-basic-in-variable-width-regions-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/fast/regions/floats-basic-in-variable-width-regions-expected.txt (110488 => 110489)
--- trunk/LayoutTests/platform/mac/fast/regions/floats-basic-in-variable-width-regions-expected.txt 2012-03-12 22:22:59 UTC (rev 110488)
+++ trunk/LayoutTests/platform/mac/fast/regions/floats-basic-in-variable-width-regions-expected.txt 2012-03-12 22:24:39 UTC (rev 110489)
@@ -1,37 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x422
- RenderBlock {HTML} at (0,0) size 800x422
- RenderBody {BODY} at (8,8) size 784x406
- RenderBlock {DIV} at (0,0) size 784x406
- RenderRegion {DIV} at (0,0) size 302x102 [border: (1px solid #000000)]
- RenderRegion {DIV} at (0,102) size 402x182 [border: (1px solid #000000)]
- RenderRegion {DIV} at (0,284) size 222x122 [border: (1px solid #000000)]
-Flow Threads
- Thread with flow-name 'flow1'
- layer at (0,0) size 400x400
- RenderFlowThread at (0,0) size 400x400
- RenderBlock {DIV} at (0,0) size 400x247
- RenderBlock {DIV} at (5,5) size 390x237 [border: (1px solid #0000FF)]
- RenderBlock {DIV} at (48,1) size 293x235 [border: (1px solid #008000)]
- RenderBlock (floating) {DIV} at (-11,1) size 50x50 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (155,1) size 50x50 [bgcolor=#00FF00]
- RenderBlock {P} at (1,17) size 291x113
- RenderText {#text} at (38,0) size 303x113
- text run at (38,0) width 116: "These lines will"
- text run at (38,18) width 116: "not spill out of the"
- text run at (-12,36) width 216: "regions. These lines will not spill"
- text run at (-12,54) width 139: "out of the regions. "
- text run at (127,54) width 77: "These lines"
- text run at (0,77) width 291: "will not spill out of the regions. These lines"
- text run at (0,95) width 196: "will not spill out of the regions."
- RenderBlock {P} at (1,146) size 291x72
- RenderText {#text} at (0,0) size 291x72
- text run at (0,0) width 291: "These lines will not spill out of the regions."
- text run at (0,18) width 291: "These lines will not spill out of the regions."
- text run at (0,36) width 291: "These lines will not spill out of the regions."
- text run at (0,54) width 271: "These lines will not spill out of the regions."
- Regions for flow 'flow1'
- RenderRegion {DIV} #region1
- RenderRegion {DIV} #region2
- RenderRegion {DIV} #region3
