<!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>[175755] 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/175755">175755</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-11-07 12:02:58 -0800 (Fri, 07 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] the sandbag JS utility code isn't producing the correct expected result in the shape-image gradient tests
https://bugs.webkit.org/show_bug.cgi?id=135923
Reviewed by Dirk Schulze.
Import tests from upstream. They have been modified so that they use
testharness to validate success or failure instead of being reftests,
allowing for fuzziness in matching to get around small variances
between implementations.
* TestExpectations:
* css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.html: Removed.
* css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.txt: Added.
* css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html:
* css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.html: Removed.
* css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.txt: Added.
* css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html:
* css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.html: Removed.
* css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.txt: Added.
* css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html:
* css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.html: Removed.
* css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.txt: Added.
* css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html:
* css3/shapes/shape-outside/shape-image/gradients/w3c-import.log:
* css3/shapes/shape-outside/supported-shapes/support/test-utils.js:
(verifyTextPoints):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient001html">trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient002html">trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient003html">trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient004html">trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsw3cimportlog">trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/w3c-import.log</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsidesupportedshapessupporttestutilsjs">trunk/LayoutTests/css3/shapes/shape-outside/supported-shapes/support/test-utils.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient001expectedtxt">trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient002expectedtxt">trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient003expectedtxt">trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient004expectedtxt">trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient001expectedhtml">trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient002expectedhtml">trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient003expectedhtml">trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient004expectedhtml">trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (175754 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-11-07 18:58:00 UTC (rev 175754)
+++ trunk/LayoutTests/ChangeLog 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-11-07 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] the sandbag JS utility code isn't producing the correct expected result in the shape-image gradient tests
+ https://bugs.webkit.org/show_bug.cgi?id=135923
+
+ Reviewed by Dirk Schulze.
+
+ Import tests from upstream. They have been modified so that they use
+ testharness to validate success or failure instead of being reftests,
+ allowing for fuzziness in matching to get around small variances
+ between implementations.
+
+ * TestExpectations:
+ * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.html: Removed.
+ * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.txt: Added.
+ * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html:
+ * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.html: Removed.
+ * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.txt: Added.
+ * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html:
+ * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.html: Removed.
+ * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.txt: Added.
+ * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html:
+ * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.html: Removed.
+ * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.txt: Added.
+ * css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html:
+ * css3/shapes/shape-outside/shape-image/gradients/w3c-import.log:
+ * css3/shapes/shape-outside/supported-shapes/support/test-utils.js:
+ (verifyTextPoints):
+
</ins><span class="cx"> 2014-11-07 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Gardening: get-by-pname.js is failing when run with JSC_useLLINT=false and other special JIT configurations.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (175754 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2014-11-07 18:58:00 UTC (rev 175754)
+++ trunk/LayoutTests/TestExpectations 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -132,11 +132,6 @@
</span><span class="cx">
</span><span class="cx"> # Various failures from the W3C CSS Shapes test suite import
</span><span class="cx">
</span><del>-webkit.org/b/135923 css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html [ ImageOnlyFailure ]
-webkit.org/b/135923 css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html [ ImageOnlyFailure ]
-webkit.org/b/135923 css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html [ ImageOnlyFailure ]
-webkit.org/b/135923 css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html [ ImageOnlyFailure ]
-
</del><span class="cx"> webkit.org/b/137788 css3/shapes/shape-outside/shape-image/shape-image-010.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/137788 css3/shapes/shape-outside/shape-image/shape-image-024.html [ ImageOnlyFailure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient001expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.html (175754 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.html 2014-11-07 18:58:00 UTC (rev 175754)
+++ trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.html 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
- <title>CSS Reference File</title>
- <link rel="author" title="Bear Travis" href="betravis@adobe.com"/>
- <style type="text/css">
- body { margin: 0; }
- .container {
- width: 200px;
- height: 200px;
- font-family: Ahem;
- font-size: 10px;
- line-height: 1;
- }
- #test {
- color: green;
- }
- .left-circle-float-line {
- float: left;
- clear: left;
- height: 10px;
- }
- </style>
-</head>
-<body>
- <p>
- The test passes if you see green boxes following the contour of a circle. There should be no red.
- </p>
- <div id="test" class="container">
- x</br>
- <div id="left-gradient"></div>
- <span id='test0'>x</span><br/>
- <span id='test1'>x</span><br/>
- <span id='test2'>x</span><br/>
- <span id='test3'>x</span><br/>
- <span id='test4'>x</span><br/>
- <span id='test5'>x</span><br/>
- <span id='test6'>x</span><br/>
- <span id='test7'>x</span><br/>
- <span id='test8'>x</span><br/>
- <span id='test9'>x</span><br/>
- x<br/>
- </div>
- <script src="../../supported-shapes/support/rounded-rectangle.js"></script>
- <script src="../../supported-shapes/support/subpixel-utils.js"></script>
- <script>
- genLeftRoundedRectFloatShapeOutsideRefTest({
- roundedRect: {x: 0, y: 10, width: 100, height: 100, rx: 50, ry: 50},
- containerWidth: 200,
- containerHeight: 200,
- lineHeight: 10,
- floatElementClassSuffix: "circle-float-line",
- insertElementIdSuffix: "gradient"
- });
- </script>
-
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient001expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.txt (0 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.txt 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+The test passes if you see green boxes following the contour of a circle. There should be no red.
+
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+
+PASS CSS Test: Left float with radial gradient
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient001html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html (175754 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html 2014-11-07 18:58:00 UTC (rev 175754)
+++ trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -48,6 +48,9 @@
</span><span class="cx"> <span id='test9'>x</span><br/>
</span><span class="cx"> x<br/>
</span><span class="cx"> </div>
</span><ins>+ <div id="log"></div>
+ <script src="../../../../../resources/testharness.js"></script>
+ <script src="../../../../../resources/testharnessreport.js"></script>
</ins><span class="cx"> <script src="../../supported-shapes/support/rounded-rectangle.js"></script>
</span><span class="cx"> <script src="../../supported-shapes/support/subpixel-utils.js"></script>
</span><span class="cx"> <script src="../../supported-shapes/support/test-utils.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient002expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.html (175754 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.html 2014-11-07 18:58:00 UTC (rev 175754)
+++ trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.html 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
- <title>CSS Reference File</title>
- <link rel="author" title="Bear Travis" href="betravis@adobe.com"/>
- <style type="text/css">
- body { margin: 0; }
- .container {
- width: 200px;
- height: 200px;
- font-family: Ahem;
- font-size: 10px;
- line-height: 1;
- }
- #test {
- color: green;
- }
- .left-circle-float-line {
- float: left;
- clear: left;
- height: 10px;
- }
- </style>
-</head>
-<body>
- <p>
- The test passes if you see green boxes following the contour of a circle. There should be no red.
- </p>
- <div id="test" class="container">
- x</br>
- <div id="left-gradient"></div>
- <span id='test0'>x</span><br/>
- <span id='test1'>x</span><br/>
- <span id='test2'>x</span><br/>
- <span id='test3'>x</span><br/>
- <span id='test4'>x</span><br/>
- <span id='test5'>x</span><br/>
- <span id='test6'>x</span><br/>
- <span id='test7'>x</span><br/>
- <span id='test8'>x</span><br/>
- <span id='test9'>x</span><br/>
- x<br/>
- </div>
- <script src="../../supported-shapes/support/rounded-rectangle.js"></script>
- <script src="../../supported-shapes/support/subpixel-utils.js"></script>
- <script>
- genLeftRoundedRectFloatShapeOutsideRefTest({
- roundedRect: {x: 0, y: 10, width: 100, height: 100, rx: 50, ry: 50},
- containerWidth: 200,
- containerHeight: 200,
- lineHeight: 10,
- floatElementClassSuffix: "circle-float-line",
- insertElementIdSuffix: "gradient"
- });
- </script>
-
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient002expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.txt (0 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.txt 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+The test passes if you see green boxes following the contour of a circle. There should be no red.
+
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+
+PASS CSS Test: Left float with radial gradient and percentage shape margin
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient002html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html (175754 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html 2014-11-07 18:58:00 UTC (rev 175754)
+++ trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -6,7 +6,6 @@
</span><span class="cx"> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/>
</span><span class="cx"> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
</span><span class="cx"> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/>
</span><del>- <link rel="match" href="reference/shape-outside-radial-gradient-001-ref.html"/>
</del><span class="cx"> <meta name="flags" content="ahem dom"/>
</span><span class="cx"> <meta name="assert" content="This test verifies that shape-outside respects a
</span><span class="cx"> simple radial gradient when a percentage margin
</span><span class="lines">@@ -51,6 +50,9 @@
</span><span class="cx"> <span id='test9'>x</span><br/>
</span><span class="cx"> x<br/>
</span><span class="cx"> </div>
</span><ins>+ <div id="log"></div>
+ <script src="../../../../../resources/testharness.js"></script>
+ <script src="../../../../../resources/testharnessreport.js"></script>
</ins><span class="cx"> <script src="../../supported-shapes/support/rounded-rectangle.js"></script>
</span><span class="cx"> <script src="../../supported-shapes/support/subpixel-utils.js"></script>
</span><span class="cx"> <script src="../../supported-shapes/support/test-utils.js"></script>
</span><span class="lines">@@ -60,7 +62,7 @@
</span><span class="cx"> containerWidth: 200,
</span><span class="cx"> containerHeight: 200,
</span><span class="cx"> lineHeight: 10
</span><del>- }, 10);
</del><ins>+ }, 10, 1);
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient003expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.html (175754 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.html 2014-11-07 18:58:00 UTC (rev 175754)
+++ trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.html 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
- <title>CSS Reference File</title>
- <link rel="author" title="Bear Travis" href="betravis@adobe.com"/>
- <style type="text/css">
- body { margin: 0; }
- .container {
- width: 200px;
- height: 200px;
- font-family: Ahem;
- font-size: 10px;
- line-height: 1;
- }
- #test {
- color: green;
- }
- .left-circle-float-line {
- float: left;
- clear: left;
- height: 10px;
- }
- </style>
-</head>
-<body>
- <p>
- The test passes if you see green boxes following the contour of a circle. There should be no red.
- </p>
- <div id="test" class="container">
- x</br>
- <div id="left-gradient"></div>
- <span id='test0'>x</span><br/>
- <span id='test1'>x</span><br/>
- <span id='test2'>x</span><br/>
- <span id='test3'>x</span><br/>
- <span id='test4'>x</span><br/>
- <span id='test5'>x</span><br/>
- <span id='test6'>x</span><br/>
- <span id='test7'>x</span><br/>
- <span id='test8'>x</span><br/>
- <span id='test9'>x</span><br/>
- x<br/>
- </div>
- <script src="../../supported-shapes/support/rounded-rectangle.js"></script>
- <script src="../../supported-shapes/support/subpixel-utils.js"></script>
- <script>
- genLeftRoundedRectFloatShapeOutsideRefTest({
- roundedRect: {x: 0, y: 10, width: 100, height: 100, rx: 50, ry: 50},
- containerWidth: 200,
- containerHeight: 200,
- lineHeight: 10,
- floatElementClassSuffix: "circle-float-line",
- insertElementIdSuffix: "gradient"
- });
- </script>
-
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient003expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.txt (0 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.txt 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+The test passes if you see green boxes following the contour of a circle. There should be no red.
+
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+
+PASS CSS Test: Left float with radial gradient shape, shape margin, and shape-image-threshold
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient003html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html (175754 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html 2014-11-07 18:58:00 UTC (rev 175754)
+++ trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -7,7 +7,6 @@
</span><span class="cx"> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
</span><span class="cx"> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/>
</span><span class="cx"> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-image-threshold-property"/>
</span><del>- <link rel="match" href="reference/shape-outside-radial-gradient-001-ref.html"/>
</del><span class="cx"> <meta name="flags" content="ahem dom"/>
</span><span class="cx"> <meta name="assert" content="This test verifies that shape-outside respects a
</span><span class="cx"> simple radial gradient when a shape margin
</span><span class="lines">@@ -53,6 +52,9 @@
</span><span class="cx"> <span id='test9'>x</span><br/>
</span><span class="cx"> x<br/>
</span><span class="cx"> </div>
</span><ins>+ <div id="log"></div>
+ <script src="../../../../../resources/testharness.js"></script>
+ <script src="../../../../../resources/testharnessreport.js"></script>
</ins><span class="cx"> <script src="../../supported-shapes/support/rounded-rectangle.js"></script>
</span><span class="cx"> <script src="../../supported-shapes/support/subpixel-utils.js"></script>
</span><span class="cx"> <script src="../../supported-shapes/support/test-utils.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient004expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.html (175754 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.html 2014-11-07 18:58:00 UTC (rev 175754)
+++ trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.html 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
- <title>CSS Reference File</title>
- <link rel="author" title="Bear Travis" href="betravis@adobe.com"/>
- <style type="text/css">
- body { margin: 0; }
- .container {
- width: 200px;
- height: 200px;
- font-family: Ahem;
- font-size: 10px;
- line-height: 1;
- }
- #test {
- color: green;
- }
- .left-circle-float-line {
- float: left;
- clear: left;
- height: 10px;
- }
- </style>
-</head>
-<body>
- <p>
- The test passes if you see green boxes following the contour of a circle. There should be no red.
- </p>
- <div id="test" class="container">
- x</br>
- <div id="left-gradient"></div>
- <span id='test0'>x</span><br/>
- <span id='test1'>x</span><br/>
- <span id='test2'>x</span><br/>
- <span id='test3'>x</span><br/>
- <span id='test4'>x</span><br/>
- <span id='test5'>x</span><br/>
- <span id='test6'>x</span><br/>
- <span id='test7'>x</span><br/>
- <span id='test8'>x</span><br/>
- <span id='test9'>x</span><br/>
- x<br/>
- </div>
- <script src="../../supported-shapes/support/rounded-rectangle.js"></script>
- <script src="../../supported-shapes/support/subpixel-utils.js"></script>
- <script>
- genLeftRoundedRectFloatShapeOutsideRefTest({
- roundedRect: {x: 0, y: 10, width: 100, height: 100, rx: 50, ry: 50},
- containerWidth: 200,
- containerHeight: 200,
- lineHeight: 10,
- floatElementClassSuffix: "circle-float-line",
- insertElementIdSuffix: "gradient"
- });
- </script>
-
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient004expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.txt (0 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.txt 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+The test passes if you see green boxes following the contour of a circle. There should be no red.
+
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+
+PASS CSS Test: Left float with radial gradient shape, shape margin, and shape-image-threshold
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsshapeoutsideradialgradient004html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html (175754 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html 2014-11-07 18:58:00 UTC (rev 175754)
+++ trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -6,7 +6,6 @@
</span><span class="cx"> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/>
</span><span class="cx"> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
</span><span class="cx"> <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-image-threshold-property"/>
</span><del>- <link rel="match" href="reference/shape-outside-radial-gradient-001-ref.html"/>
</del><span class="cx"> <meta name="flags" content="ahem dom"/>
</span><span class="cx"> <meta name="assert" content="This test verifies that shape-outside respects a
</span><span class="cx"> simple radial gradient on a right float when
</span><span class="lines">@@ -52,6 +51,9 @@
</span><span class="cx"> <span id='test9'>x</span><br/>
</span><span class="cx"> x<br/>
</span><span class="cx"> </div>
</span><ins>+ <div id="log"></div>
+ <script src="../../../../../resources/testharness.js"></script>
+ <script src="../../../../../resources/testharnessreport.js"></script>
</ins><span class="cx"> <script src="../../supported-shapes/support/rounded-rectangle.js"></script>
</span><span class="cx"> <script src="../../supported-shapes/support/subpixel-utils.js"></script>
</span><span class="cx"> <script src="../../supported-shapes/support/test-utils.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsideshapeimagegradientsw3cimportlog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/w3c-import.log (175754 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/w3c-import.log 2014-11-07 18:58:00 UTC (rev 175754)
+++ trunk/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/w3c-import.log 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> Do NOT modify or remove this file
</span><span class="cx">
</span><span class="cx"> ------------------------------------------------------------------------
</span><del>-Last Import: 2014-10-27 11:23
</del><ins>+Last Import: 2014-11-07 10:20
</ins><span class="cx"> ------------------------------------------------------------------------
</span><span class="cx"> Properties requiring vendor prefixes:
</span><span class="cx"> shape-outside
</span><span class="lines">@@ -20,19 +20,15 @@
</span><span class="cx"> None
</span><span class="cx"> ------------------------------------------------------------------------
</span><span class="cx"> List of files:
</span><del>-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001-expected.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002-expected.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003-expected.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-004-expected.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-004.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001-expected.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002-expected.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003-expected.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004-expected.html
-/LayoutTests/css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html
</del><ins>+/LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001-expected.html
+/LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-001.html
+/LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002-expected.html
+/LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-002.html
+/LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003-expected.html
+/LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html
+/LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-004-expected.html
+/LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-linear-gradient-004.html
+/LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html
+/LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-002.html
+/LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html
+/LayoutTests/w3c/css-shapes-1/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html
</ins></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsidesupportedshapessupporttestutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/shapes/shape-outside/supported-shapes/support/test-utils.js (175754 => 175755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/supported-shapes/support/test-utils.js 2014-11-07 18:58:00 UTC (rev 175754)
+++ trunk/LayoutTests/css3/shapes/shape-outside/supported-shapes/support/test-utils.js 2014-11-07 20:02:58 UTC (rev 175755)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> function verifyTextPoints(shape, numLines, tolerance, side) {
</span><ins>+ var failed = false;
</ins><span class="cx"> if (tolerance === undefined)
</span><span class="cx"> tolerance = 0.5;
</span><span class="cx"> if (side === undefined)
</span><span class="lines">@@ -14,10 +15,15 @@
</span><span class="cx"> var actual = line.getBoundingClientRect().left;
</span><span class="cx"> if (side === "right")
</span><span class="cx"> actual = shape.containerWidth - (actual + line.getBoundingClientRect().width);
</span><del>-
</del><ins>+
</ins><span class="cx"> if( Math.abs( (actual - expected[i])) > tolerance ){
</span><span class="cx"> line.style.setProperty('color', 'red');
</span><span class="cx"> console.log('diff: ' + Math.abs(actual - expected[i]));
</span><ins>+ failed = true;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ if (window.done) {
+ assert_false(failed, "Lines positioned properly around the shape.");
+ done();
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>