Title: [172116] trunk/LayoutTests
- Revision
- 172116
- Author
- bjone...@adobe.com
- Date
- 2014-08-05 18:30:27 -0700 (Tue, 05 Aug 2014)
Log Message
[GTK] [CSS Shapes] Layout test fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html fails
https://bugs.webkit.org/show_bug.cgi?id=135585
Reviewed by Zoltan Horvath.
The positioning was dependent on the font metrics of the <p> tag,
which differs between platforms. This fixes that, which should make
the test pass on all platforms.
* fast/shapes/shape-outside-floats/shape-outside-image-shape-margin-expected.html:
* fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html:
* platform/gtk/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (172115 => 172116)
--- trunk/LayoutTests/ChangeLog 2014-08-06 01:07:09 UTC (rev 172115)
+++ trunk/LayoutTests/ChangeLog 2014-08-06 01:30:27 UTC (rev 172116)
@@ -1,3 +1,18 @@
+2014-08-05 Bem Jones-Bey <bjone...@adobe.com>
+
+ [GTK] [CSS Shapes] Layout test fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=135585
+
+ Reviewed by Zoltan Horvath.
+
+ The positioning was dependent on the font metrics of the <p> tag,
+ which differs between platforms. This fixes that, which should make
+ the test pass on all platforms.
+
+ * fast/shapes/shape-outside-floats/shape-outside-image-shape-margin-expected.html:
+ * fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html:
+ * platform/gtk/TestExpectations:
+
2014-08-05 Simon Fraser <simon.fra...@apple.com>
[iOS WK2] Crash going back on a specific tumblr blog (under ScrollingStateTree::removeNodeAndAllDescendants)
Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin-expected.html (172115 => 172116)
--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin-expected.html 2014-08-06 01:07:09 UTC (rev 172115)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin-expected.html 2014-08-06 01:30:27 UTC (rev 172116)
@@ -4,9 +4,14 @@
<title>CSS Reference File</title>
<link rel="author" title="Rebecca Hauck" href=""
<style type="text/css">
+ #outer {
+ position: relative;
+ width: 100px;
+ height: 250px;
+ }
#container {
position: absolute;
- top: 170px;
+ top: 120px;
}
#shape-ref-div {
width: 50px;
@@ -24,9 +29,11 @@
<p>
The test passes if the green rectangle is below the line. There should be no red.
</p>
- <div id="container">
- <div id="line"><div>
- <div id="shape-ref-div"></div>
+ <div id="outer">
+ <div id="container">
+ <div id="line"><div>
+ <div id="shape-ref-div"></div>
+ </div>
</div>
</body>
</html>
Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html (172115 => 172116)
--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html 2014-08-06 01:07:09 UTC (rev 172115)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html 2014-08-06 01:30:27 UTC (rev 172116)
@@ -12,6 +12,11 @@
shape-margin extending beyond the margin-right, causing the
text to be pushed below the defined shape."/>
<style type="text/css">
+ #outer {
+ position: relative;
+ width: 100px;
+ height: 250px;
+ }
.container {
position: relative;
font-family: Ahem;
@@ -33,7 +38,7 @@
}
#ref {
position: absolute;
- top: 170px;
+ top: 120px;
}
#line {
width: 100px;
@@ -52,14 +57,15 @@
<p>
The test passes if the green rectangle is below the line. There should be no red.
</p>
- <div id="ref">
- <div id="line"></div>
- <div id="failure"></div>
+ <div id="outer">
+ <div id="ref">
+ <div id="line"></div>
+ <div id="failure"></div>
+ </div>
+ <div id="test" class="container">
+ <div id="shape-div"></div>
+ x x
+ </div>
</div>
- <div id="test" class="container">
- <div id="shape-div"></div>
- x x
- </div>
-
</body>
</html>
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (172115 => 172116)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-08-06 01:07:09 UTC (rev 172115)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-08-06 01:30:27 UTC (rev 172116)
@@ -431,8 +431,6 @@
webkit.org/b/133806 svg/masking/mask-transformed-text-missing.svg [ ImageOnlyFailure ]
-webkit.org/b/135585 fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html [ ImageOnlyFailure ]
-
#////////////////////////////////////////////////////////////////////////////////////////
# End of Expected failures
#////////////////////////////////////////////////////////////////////////////////////////
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
