Diff
Modified: trunk/LayoutTests/ChangeLog (149856 => 149857)
--- trunk/LayoutTests/ChangeLog 2013-05-09 23:55:24 UTC (rev 149856)
+++ trunk/LayoutTests/ChangeLog 2013-05-10 00:12:25 UTC (rev 149857)
@@ -1,3 +1,19 @@
+2013-05-09 Zoltan Horvath <[email protected]>
+
+ [Qt] REGRESSION (r148975) shape-inside-percentage.html and shape-inside-overflow-fixed-dimensions.html are failing after r148975
+ https://bugs.webkit.org/show_bug.cgi?id=115053
+
+ Reviewed by Alexandru Chiculita.
+
+ I changed the tests to use Ahem font (overflow will be the same on every port) and modify the markup in order to be the similar
+ for the two tests. The change fixes both tests and make them passing on Qt as well. I removed the tests from the TestExpectations.
+
+ * fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions-expected.html:
+ * fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions.html:
+ * fast/exclusions/shape-inside/shape-inside-percentage-expected.html:
+ * fast/exclusions/shape-inside/shape-inside-percentage.html:
+ * platform/qt/TestExpectations:
+
2013-05-09 Yael Aharon <[email protected]>
REGRESSION: Disabled multiline select element now responds to (certain) clicks
Modified: trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions-expected.html (149856 => 149857)
--- trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions-expected.html 2013-05-09 23:55:24 UTC (rev 149856)
+++ trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions-expected.html 2013-05-10 00:12:25 UTC (rev 149857)
@@ -2,16 +2,18 @@
<html>
<head>
<style>
-#shape-inside {
+#container {
+ font: 20px Ahem, sans-serif;
+ line-height: 20px;
border: 2px solid blue;
position: relative;
width: 200px;
height: 200px;
- line-height: 20px;
+ margin-bottom: 60px;
}
#border {
position: absolute;
- left: 58px;
+ left: 48px;
width: 100px;
height: 40px;
border: 2px solid green;
@@ -23,14 +25,18 @@
</style>
</head>
<body>
-<div id="border"></div>
-<div id="shape-inside">
- <div class="spacer" style="float:left"></div>
- <div class="spacer" style="float:right"></div>
- This text should wrap
- <div style="padding-top: 162px;">
- inside the green rectangle, and overflow should wrap outside the blue rectangle.
+ <div id="container">
+ <div id="border"></div>
+ <div id="shape-inside">
+ <div class="spacer" style="float:left"></div>
+ <div class="spacer" style="float:right"></div>
+ X X X X X X
+ </div>
+ <div style="padding-top: 160px;">
+ X X X X X X X X X X
+ </div>
</div>
-</div>
+<p>Requires Ahem font. The content should start inside the green rectangle (shape-inside) and the overflow should be pushed below the content box (content-box's margin is blue). <br/>
+<p>Bug <a href="" [CSS Exclusions] shape-inside overflow should be pushed to the outside of the content box</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions.html (149856 => 149857)
--- trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions.html 2013-05-09 23:55:24 UTC (rev 149856)
+++ trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions.html 2013-05-10 00:12:25 UTC (rev 149857)
@@ -6,17 +6,24 @@
window.internals.settings.setCSSExclusionsEnabled(true);
</script>
<style>
-#shape-inside {
+#container {
+ font: 20px Ahem, sans-serif;
+ line-height: 20px;
border: 2px solid blue;
position: relative;
width: 200px;
height: 200px;
- line-height: 20px;
-webkit-shape-inside: rectangle(50px, 0px, 100px, 45px);
+ margin-bottom: 60px;
}
+#shape-inside {
+ width: 200px;
+ height: 200px;
+ -webkit-shape-inside: rectangle(50px, 0px, 100px, 50px);
+}
#border {
position: absolute;
- left: 58px;
+ left: 48px;
width: 100px;
height: 40px;
border: 2px solid green;
@@ -24,10 +31,13 @@
</style>
</head>
<body>
-<div id="border"></div>
-<div id="shape-inside">
- This text should wrap inside the green rectangle, and overflow should wrap
- outside the blue rectangle.
-</div>
+ <div id="container">
+ <div id="border"></div>
+ <div id="shape-inside">
+ X X X X X X X X X X X X X X X X
+ </div>
+ </div>
+ <p>Requires Ahem font. The content should start inside the green rectangle (shape-inside) and the overflow should be pushed below the content box (content-box's margin is blue). <br/>
+ <p>Bug <a href="" [CSS Exclusions] shape-inside overflow should be pushed to the outside of the content box</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-percentage-expected.html (149856 => 149857)
--- trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-percentage-expected.html 2013-05-09 23:55:24 UTC (rev 149856)
+++ trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-percentage-expected.html 2013-05-10 00:12:25 UTC (rev 149857)
@@ -3,10 +3,13 @@
<head>
<style>
#container {
+ font: 20px Ahem, sans-serif;
+ line-height: 20px;
border: 2px solid blue;
position: relative;
width: 200px;
height: 200px;
+ margin-bottom: 60px;
}
#border {
position: absolute;
@@ -27,11 +30,13 @@
<div id="shape-inside">
<div class="spacer" style="float:left"></div>
<div class="spacer" style="float:right"></div>
- This text should wrap
- <div style="padding-top: 164px;">
- inside the green rectangle, and overflow should wrap outside the blue rectangle.
- </div>
+ X X X X X X
</div>
+ <div style="padding-top: 160px;">
+ X X X X X X X X X X
+ </div>
</div>
+ <p>Requires Ahem font. The content should start inside the green rectangle (shape-inside) and the overflow should be pushed below the content box (content-box's margin is blue). <br/>
+ <p>Bug <a href="" [CSS Exclusions] shape-inside overflow should be pushed to the outside of the content box</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-percentage.html (149856 => 149857)
--- trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-percentage.html 2013-05-09 23:55:24 UTC (rev 149856)
+++ trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-percentage.html 2013-05-10 00:12:25 UTC (rev 149857)
@@ -7,10 +7,13 @@
</script>
<style>
#container {
+ font: 20px Ahem, sans-serif;
+ line-height: 20px;
border: 2px solid blue;
position: relative;
width: 200px;
height: 200px;
+ margin-bottom: 60px;
}
#shape-inside {
-webkit-shape-inside: rectangle(25%, 0, 50%, 25%);
@@ -30,9 +33,10 @@
<div id="container">
<div id="border"></div>
<div id="shape-inside">
- This text should wrap inside the green rectangle, and overflow should wrap
- outside the blue rectangle.
+ X X X X X X X X X X X X X X X X
</div>
</div>
+ <p>Requires Ahem font. The content should start inside the green rectangle (shape-inside) and the overflow should be pushed below the content box (content-box's margin is blue). <br/>
+ <p>Bug <a href="" [CSS Exclusions] shape-inside overflow should be pushed to the outside of the content box</p>
</body>
</html>
Modified: trunk/LayoutTests/platform/qt/TestExpectations (149856 => 149857)
--- trunk/LayoutTests/platform/qt/TestExpectations 2013-05-09 23:55:24 UTC (rev 149856)
+++ trunk/LayoutTests/platform/qt/TestExpectations 2013-05-10 00:12:25 UTC (rev 149857)
@@ -1508,10 +1508,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=67128
fast/css/square-button-appearance.html
-# [Qt] REGRESSION (r148975) shape-inside-percentage.html and shape-inside-overflow-fixed-dimensions.html are failing after r148975
-# https://bugs.webkit.org/show_bug.cgi?id=115053
-fast/exclusions/shape-inside/shape-inside-overflow-fixed-dimensions.html
-fast/exclusions/shape-inside/shape-inside-percentage.html
fast/exclusions/shape-inside/shape-inside-polygon-layout.html
# REGRESSION(r149457): some fast/exclusions tests are failing
