Diff
Modified: trunk/LayoutTests/ChangeLog (149801 => 149802)
--- trunk/LayoutTests/ChangeLog 2013-05-09 13:12:54 UTC (rev 149801)
+++ trunk/LayoutTests/ChangeLog 2013-05-09 13:48:30 UTC (rev 149802)
@@ -1,3 +1,23 @@
+2013-05-09 Radu Stavila <[email protected]>
+
+ [Qt][EFL][GTK] Failing CSS region tests
+ https://bugs.webkit.org/show_bug.cgi?id=115785
+
+ Reviewed by Antti Koivisto.
+
+ Updated tests to overcome platform differences
+ Unskip fixed CSS regions tests
+
+ * fast/regions/webkit-flow-double-pagination-float-push-expected.html:
+ * fast/regions/webkit-flow-double-pagination-float-push.html:
+ * fast/regions/webkit-flow-float-pushed-to-last-region-expected.html:
+ * fast/regions/webkit-flow-float-pushed-to-last-region.html:
+ * fast/regions/webkit-flow-float-unable-to-push-expected.html:
+ * fast/regions/webkit-flow-float-unable-to-push.html:
+ * fast/regions/webkit-flow-floats-inside-regions-bounds-expected.html:
+ * fast/regions/webkit-flow-floats-inside-regions-bounds.html:
+ * platform/qt/TestExpectations:
+
2013-05-09 Zoltan Arvai <[email protected]>
[Qt] Unreviewed gardeing. Updating some png expected results.
Modified: trunk/LayoutTests/fast/regions/webkit-flow-double-pagination-float-push-expected.html (149801 => 149802)
--- trunk/LayoutTests/fast/regions/webkit-flow-double-pagination-float-push-expected.html 2013-05-09 13:12:54 UTC (rev 149801)
+++ trunk/LayoutTests/fast/regions/webkit-flow-double-pagination-float-push-expected.html 2013-05-09 13:48:30 UTC (rev 149802)
@@ -2,12 +2,17 @@
<style>
.test_paragraph {
- margin-top: 16px;
+ margin-top: 1em;
+ margin-bottom: 1em;
text-align: justify;
+ font-size: 10px;
+ font-family: Ahem;
+ -webkit-font-smoothing: none;
}
#top_paragraph {
- margin-bottom: 16px;
+ margin-top: 1em;
+ margin-bottom: 1em;
}
#region1 {
@@ -76,7 +81,6 @@
border: 1px solid green;
border-top: none;
width: 366px;
- height: 300px;
}
#imgFloat1 {
@@ -94,7 +98,7 @@
}
</style>
-<div id="top_paragraph" class="test_paragraph">In the example below, the first float pushes content into region #2, and the second float pushes both floats into region #3.</div>
+<div id="top_paragraph">In the example below, the first float pushes content into region #2, and the second float pushes both floats into region #3.</div>
<div id="content">
<div id="region1">
Modified: trunk/LayoutTests/fast/regions/webkit-flow-double-pagination-float-push.html (149801 => 149802)
--- trunk/LayoutTests/fast/regions/webkit-flow-double-pagination-float-push.html 2013-05-09 13:12:54 UTC (rev 149801)
+++ trunk/LayoutTests/fast/regions/webkit-flow-double-pagination-float-push.html 2013-05-09 13:48:30 UTC (rev 149802)
@@ -5,6 +5,9 @@
-webkit-flow-into: flow1;
text-align: justify;
padding: 5px;
+ font-size: 10px;
+ font-family: Ahem;
+ -webkit-font-smoothing: none;
}
#first-box {
Modified: trunk/LayoutTests/fast/regions/webkit-flow-float-pushed-to-last-region-expected.html (149801 => 149802)
--- trunk/LayoutTests/fast/regions/webkit-flow-float-pushed-to-last-region-expected.html 2013-05-09 13:12:54 UTC (rev 149801)
+++ trunk/LayoutTests/fast/regions/webkit-flow-float-pushed-to-last-region-expected.html 2013-05-09 13:48:30 UTC (rev 149802)
@@ -2,8 +2,12 @@
<style>
.test_paragraph {
- margin-top: 16px;
+ margin-top: 1em;
+ margin-bottom: 1em;
text-align: justify;
+ font-size: 10px;
+ font-family: Ahem;
+ -webkit-font-smoothing: none;
}
#region1 {
@@ -72,7 +76,6 @@
border: 1px solid green;
border-top: none;
width: 366px;
- height: 246px;
}
#imgFloat {
Modified: trunk/LayoutTests/fast/regions/webkit-flow-float-pushed-to-last-region.html (149801 => 149802)
--- trunk/LayoutTests/fast/regions/webkit-flow-float-pushed-to-last-region.html 2013-05-09 13:12:54 UTC (rev 149801)
+++ trunk/LayoutTests/fast/regions/webkit-flow-float-pushed-to-last-region.html 2013-05-09 13:48:30 UTC (rev 149802)
@@ -1,6 +1,12 @@
<!doctype html>
<style>
+ p {
+ font-size: 10px;
+ font-family: Ahem;
+ -webkit-font-smoothing: none;
+ }
+
#content {
-webkit-flow-into: flow1;
text-align: justify;
Modified: trunk/LayoutTests/fast/regions/webkit-flow-float-unable-to-push-expected.html (149801 => 149802)
--- trunk/LayoutTests/fast/regions/webkit-flow-float-unable-to-push-expected.html 2013-05-09 13:12:54 UTC (rev 149801)
+++ trunk/LayoutTests/fast/regions/webkit-flow-float-unable-to-push-expected.html 2013-05-09 13:48:30 UTC (rev 149802)
@@ -2,8 +2,12 @@
<style>
.test_paragraph {
- margin-top: 16px;
+ margin-top: 1em;
+ margin-bottom: 1em;
text-align: justify;
+ font-size: 10px;
+ font-family: Ahem;
+ -webkit-font-smoothing: none;
}
/* Created to justify the last line of text in the div */
@@ -90,7 +94,6 @@
border: 1px solid green;
border-top: none;
width: 366px;
- height: 104px;
}
.imgFloat {
@@ -100,19 +103,19 @@
#float1 {
width: 130px;
- height: 57px;
+ height: 63px;
}
#float2 {
width: 30px;
- height: 43px;
+ height: 37px;
}
#imgAbsolute {
position: absolute;
background-color: green;
width: 100px;
- height: 43px;
+ height: 37px;
left: 292px;
top: 101px;
}
@@ -122,7 +125,7 @@
<div id="region1">
<div id="first-box1">
<div id="second-box1">
- <div class="test_paragraph" id="paragraph1">This line of text should not get<img class="imgFloat" id="float1" src="" out of the region. This line of text should not get out of the region. This line of</div>
+ <div class="test_paragraph" id="paragraph1">This <img class="imgFloat" id="float1" src="" of text should not get out of the region. This line of text should not get out of the region. This line of text should not</div>
</div>
</div>
</div>
@@ -130,8 +133,8 @@
<div id="region2">
<div id="first-box2">
<div id="second-box2">
- <div class="test_paragraph" id="first-paragraph2">text should not get<img class="imgFloat" id="float2" src="" out of the region. This line of text should not get out of the region.</div>
- <div class="test_paragraph" id="second-paragraph2">This line of text should not get out of the</div>
+ <div class="test_paragraph" id="first-paragraph2">get<img class="imgFloat" id="float2" src="" out of the region. This line of text should not get out of the region.</div>
+ <div class="test_paragraph" id="second-paragraph2">This line of text should not get out of the region. This line of text should not get out of the region.</div>
</div>
</div>
</div>
@@ -141,7 +144,7 @@
<div id="region3">
<div id="first-box3">
<div id="second-box3">
- <div class="test_paragraph" id="first-paragraph3">region. This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region.</div>
+ <div class="test_paragraph" id="first-paragraph3">This line of text should not get out of the region. This line of text should not get out of the region.</div>
<div class="test_paragraph" id="second-paragraph3">This line of text should not get out of the region.</div>
</div>
</div>
Modified: trunk/LayoutTests/fast/regions/webkit-flow-float-unable-to-push.html (149801 => 149802)
--- trunk/LayoutTests/fast/regions/webkit-flow-float-unable-to-push.html 2013-05-09 13:12:54 UTC (rev 149801)
+++ trunk/LayoutTests/fast/regions/webkit-flow-float-unable-to-push.html 2013-05-09 13:48:30 UTC (rev 149802)
@@ -5,6 +5,9 @@
-webkit-flow-into: flow1;
text-align: justify;
padding: 5px;
+ font-size: 10px;
+ font-family: Ahem;
+ -webkit-font-smoothing: none;
}
#first-box {
Modified: trunk/LayoutTests/fast/regions/webkit-flow-floats-inside-regions-bounds-expected.html (149801 => 149802)
--- trunk/LayoutTests/fast/regions/webkit-flow-floats-inside-regions-bounds-expected.html 2013-05-09 13:12:54 UTC (rev 149801)
+++ trunk/LayoutTests/fast/regions/webkit-flow-floats-inside-regions-bounds-expected.html 2013-05-09 13:48:30 UTC (rev 149802)
@@ -2,8 +2,12 @@
<style>
.test_paragraph {
- margin-top: 16px;
+ margin-top: 1em;
+ margin-bottom: 1em;
text-align: justify;
+ font-size: 10px;
+ font-family: Ahem;
+ -webkit-font-smoothing: none;
}
#region1 {
@@ -29,9 +33,9 @@
#first-paragraph2 {
margin-top: 0px;
}
-
+
/* Created to justify the last line of text in the div */
- #second-paragraph2:after {
+ #third-paragraph2:after {
content: " ____";
line-height: 0;
visibility: hidden;
@@ -61,7 +65,7 @@
height: 180px;
}
- #first-paragraph3 {
+ #paragraph3 {
margin-top: 0px;
}
@@ -83,7 +87,6 @@
border: 1px solid green;
border-top: none;
width: 86px;
- height: 158px;
}
#float1 {
@@ -98,7 +101,7 @@
<div id="region1">
<div id="first-box1">
<div id="second-box1">
- <div class="test_paragraph" id="paragraph1">This line of text should not get out of the region.</div>
+ <div class="test_paragraph" id="paragraph1">This line of text should not get out of the region. This line of text should not get</div>
</div>
</div>
</div>
@@ -106,8 +109,9 @@
<div id="region2">
<div id="first-box2">
<div id="second-box2">
- <div class="test_paragraph" id="first-paragraph2">This line of text<div id="float1">Float 1</div> should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region.</div>
- <div class="test_paragraph" id="second-paragraph2">This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region. This line of text</div>
+ <div class="test_paragraph" id="first-paragraph2">out of the region. <div id="float1">Float 1</div>This line of text should not get out of the region. This line of text should not get out of the region.</div>
+ <div class="test_paragraph">This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region.</div>
+ <div class="test_paragraph" id="third-paragraph2">This line of text should not get out of the region.</div>
</div>
</div>
</div>
@@ -115,8 +119,7 @@
<div id="region3">
<div id="first-box3">
<div id="second-box3">
- <div class="test_paragraph" id="first-paragraph3">should not get out of the region.</div>
- <div class="test_paragraph" id="second-paragraph3">This line of text should not get out of the region.</div>
+ <div class="test_paragraph" id="paragraph3">This line of text should not get out of the region.</div>
</div>
</div>
</div>
Modified: trunk/LayoutTests/fast/regions/webkit-flow-floats-inside-regions-bounds.html (149801 => 149802)
--- trunk/LayoutTests/fast/regions/webkit-flow-floats-inside-regions-bounds.html 2013-05-09 13:12:54 UTC (rev 149801)
+++ trunk/LayoutTests/fast/regions/webkit-flow-floats-inside-regions-bounds.html 2013-05-09 13:48:30 UTC (rev 149802)
@@ -5,6 +5,9 @@
-webkit-flow-into: flow1;
text-align: justify;
padding: 5px;
+ font-size: 10px;
+ font-family: Ahem;
+ -webkit-font-smoothing: none;
}
#first-box {
@@ -47,9 +50,9 @@
<div id="content">
<div id="first-box">
<div id="second-box">
- <p>This line of text should not get out of the region.<div id="float1">Float 1</div> This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region.</p>
+ <p>This line of text should not get out of the region. This line of text should not get <div id="float1">Float 1</div>out of the region. This line of text should not get out of the region. This line of text should not get out of the region.</p>
<p>This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region.</p>
- <p>This line of text should not get out of the region.</p>
+ <p>This line of text should not get out of the region. This line of text should not get out of the region.</p>
</div>
</div>
</div>
Modified: trunk/LayoutTests/platform/qt/TestExpectations (149801 => 149802)
--- trunk/LayoutTests/platform/qt/TestExpectations 2013-05-09 13:12:54 UTC (rev 149801)
+++ trunk/LayoutTests/platform/qt/TestExpectations 2013-05-09 13:48:30 UTC (rev 149802)
@@ -2341,12 +2341,6 @@
webkit.org/b/114807 fast/gradients/css3-color-stop-invalid.html [ Skip ]
webkit.org/b/115512 compositing/layer-creation/deep-tree.html [ Skip ]
-# [Qt][EFL][GTK] Failing CSS region tests
-webkit.org/b/115785 fast/regions/webkit-flow-double-pagination-float-push.html [ Skip ]
-webkit.org/b/115785 fast/regions/webkit-flow-float-pushed-to-last-region.html [ Skip ]
-webkit.org/b/115785 fast/regions/webkit-flow-float-unable-to-push.html [ Skip ]
-webkit.org/b/115785 fast/regions/webkit-flow-floats-inside-regions-bounds.html [ Skip ]
-
# Failing fast/css/sticky/ tests with minor pixel differences
# https://bugs.webkit.org/show_bug.cgi?id=92080
fast/css/sticky/inline-sticky-abspos-child.html
