<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[172116] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172116">172116</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-08-05 18:30:27 -0700 (Tue, 05 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideimageshapemarginexpectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideimageshapemarginhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172115 => 172116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-06 01:07:09 UTC (rev 172115)
+++ trunk/LayoutTests/ChangeLog 2014-08-06 01:30:27 UTC (rev 172116)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-08-05 Bem Jones-Bey <bjonesbe@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:
+
</ins><span class="cx"> 2014-08-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Crash going back on a specific tumblr blog (under ScrollingStateTree::removeNodeAndAllDescendants)
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideimageshapemarginexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin-expected.html (172115 => 172116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,9 +4,14 @@
</span><span class="cx"> <title>CSS Reference File</title>
</span><span class="cx"> <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/>
</span><span class="cx"> <style type="text/css">
</span><ins>+ #outer {
+ position: relative;
+ width: 100px;
+ height: 250px;
+ }
</ins><span class="cx"> #container {
</span><span class="cx"> position: absolute;
</span><del>- top: 170px;
</del><ins>+ top: 120px;
</ins><span class="cx"> }
</span><span class="cx"> #shape-ref-div {
</span><span class="cx"> width: 50px;
</span><span class="lines">@@ -24,9 +29,11 @@
</span><span class="cx"> <p>
</span><span class="cx"> The test passes if the green rectangle is below the line. There should be no red.
</span><span class="cx"> </p>
</span><del>- <div id="container">
- <div id="line"><div>
- <div id="shape-ref-div"></div>
</del><ins>+ <div id="outer">
+ <div id="container">
+ <div id="line"><div>
+ <div id="shape-ref-div"></div>
+ </div>
</ins><span class="cx"> </div>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideimageshapemarginhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html (172115 => 172116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -12,6 +12,11 @@
</span><span class="cx"> shape-margin extending beyond the margin-right, causing the
</span><span class="cx"> text to be pushed below the defined shape."/>
</span><span class="cx"> <style type="text/css">
</span><ins>+ #outer {
+ position: relative;
+ width: 100px;
+ height: 250px;
+ }
</ins><span class="cx"> .container {
</span><span class="cx"> position: relative;
</span><span class="cx"> font-family: Ahem;
</span><span class="lines">@@ -33,7 +38,7 @@
</span><span class="cx"> }
</span><span class="cx"> #ref {
</span><span class="cx"> position: absolute;
</span><del>- top: 170px;
</del><ins>+ top: 120px;
</ins><span class="cx"> }
</span><span class="cx"> #line {
</span><span class="cx"> width: 100px;
</span><span class="lines">@@ -52,14 +57,15 @@
</span><span class="cx"> <p>
</span><span class="cx"> The test passes if the green rectangle is below the line. There should be no red.
</span><span class="cx"> </p>
</span><del>- <div id="ref">
- <div id="line"></div>
- <div id="failure"></div>
</del><ins>+ <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>
</ins><span class="cx"> </div>
</span><del>- <div id="test" class="container">
- <div id="shape-div"></div>
- x x
- </div>
-
</del><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (172115 => 172116)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -431,8 +431,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/133806 svg/masking/mask-transformed-text-missing.svg [ ImageOnlyFailure ]
</span><span class="cx">
</span><del>-webkit.org/b/135585 fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html [ ImageOnlyFailure ]
-
</del><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End of Expected failures
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre>
</div>
</div>
</body>
</html>