<!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>[153063] 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/153063">153063</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-07-23 15:20:55 -0700 (Tue, 23 Jul 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[CSS Shapes] New positioning model: support for rounded rectangle shape-outside
https://bugs.webkit.org/show_bug.cgi?id=118081

Patch by Bem Jones-Bey &lt;bjonesbe@adobe.com&gt; on 2013-07-23
Reviewed by Dean Jackson.

Update the shape-outside rounded rectangle tests and import them from
the CSS WG's repository. They have been moved to the CSS WG repository
so they can be part of the spec test suite for CSS Shapes.

* TestExpectations: Remove skipping for tests that have been replaced.
* csswg/submitted/shapes/shape-outside/resources/rounded-rectangle.js: Added.
(ellipseXIntercept):
(scanConvertRoundedRectangleOutside):
(genLeftRightRoundedRectFloatShapeOutsideRefTest):
(genLeftRoundedRectFloatShapeOutsideRefTest):
(genRightRoundedRectFloatShapeOutsideRefTest):
* csswg/submitted/shapes/shape-outside/resources/subpixel-utils.js: Added.
(SubPixelLayout):
(SubPixelLayout.):
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001-expected.html.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001.html.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002-expected.html.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002.html.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003-expected.html.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003.html.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html: Added.
* csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html: Added.
* csswg/submitted/shapes/shape-outside/w3c-import.log:</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="#trunkLayoutTestscsswgsubmittedshapesshapeoutsidew3cimportlog">trunk/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/csswg/submitted/shapes/shape-outside/resources/</li>
<li><a href="#trunkLayoutTestscsswgsubmittedshapesshapeoutsideresourcesroundedrectanglejs">trunk/LayoutTests/csswg/submitted/shapes/shape-outside/resources/rounded-rectangle.js</a></li>
<li><a href="#trunkLayoutTestscsswgsubmittedshapesshapeoutsideresourcessubpixelutilsjs">trunk/LayoutTests/csswg/submitted/shapes/shape-outside/resources/subpixel-utils.js</a></li>
<li><a href="#trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle001expectedhtml">trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html</a></li>
<li><a href="#trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle001html">trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html</a></li>
<li><a href="#trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle002expectedhtml">trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html</a></li>
<li><a href="#trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle002html">trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html</a></li>
<li><a href="#trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle003expectedhtml">trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html</a></li>
<li><a href="#trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle003html">trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html</a></li>
<li><a href="#trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle004expectedhtml">trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html</a></li>
<li><a href="#trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle004html">trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsroundedrectanglelargeradiusexpectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-rounded-rectangle-large-radius-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsroundedrectanglelargeradiushtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-rounded-rectangle-large-radius.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle001expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle001html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle002expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle002html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle003expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle003html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (153062 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-07-23 21:53:33 UTC (rev 153062)
+++ trunk/LayoutTests/ChangeLog        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2013-07-23  Bem Jones-Bey  &lt;bjonesbe@adobe.com&gt;
+
+        [CSS Shapes] New positioning model: support for rounded rectangle shape-outside
+        https://bugs.webkit.org/show_bug.cgi?id=118081
+
+        Reviewed by Dean Jackson.
+
+        Update the shape-outside rounded rectangle tests and import them from
+        the CSS WG's repository. They have been moved to the CSS WG repository
+        so they can be part of the spec test suite for CSS Shapes.
+
+        * TestExpectations: Remove skipping for tests that have been replaced.
+        * csswg/submitted/shapes/shape-outside/resources/rounded-rectangle.js: Added.
+        (ellipseXIntercept):
+        (scanConvertRoundedRectangleOutside):
+        (genLeftRightRoundedRectFloatShapeOutsideRefTest):
+        (genLeftRoundedRectFloatShapeOutsideRefTest):
+        (genRightRoundedRectFloatShapeOutsideRefTest):
+        * csswg/submitted/shapes/shape-outside/resources/subpixel-utils.js: Added.
+        (SubPixelLayout):
+        (SubPixelLayout.):
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001-expected.html.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001.html.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002-expected.html.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002.html.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003-expected.html.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html: Renamed from LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003.html.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html: Added.
+        * csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html: Added.
+        * csswg/submitted/shapes/shape-outside/w3c-import.log:
+
</ins><span class="cx"> 2013-07-23  Zalan Bujtas  &lt;zalan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(r152313): Links in certain twitter postings don't warp correctly on page
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (153062 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations        2013-07-23 21:53:33 UTC (rev 153062)
+++ trunk/LayoutTests/TestExpectations        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -37,11 +37,6 @@
</span><span class="cx"> webkit.org/b/118083 fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-inset-rectangle.html [ Skip ]
</span><span class="cx"> webkit.org/b/118083 fast/shapes/shape-outside-floats/shape-outside-floats-simple-inset-rectangle.html [ Skip ]
</span><span class="cx"> 
</span><del>-webkit.org/b/118081 fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001.html [ Skip ]
-webkit.org/b/118081 fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002.html [ Skip ]
-webkit.org/b/118081 fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003.html [ Skip ]
-webkit.org/b/118081 fast/shapes/shape-outside-floats/shape-outside-floats-rounded-rectangle-large-radius.html [ Skip ]
-
</del><span class="cx"> webkit.org/b/118087 fast/shapes/shape-outside-floats/shape-outside-floats-stacked.html [ Skip ]
</span><span class="cx"> webkit.org/b/118087 fast/shapes/shape-outside-floats/shape-outside-floats-simple-rectangle-horizontal-multiple.html [ Skip ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscsswgsubmittedshapesshapeoutsideresourcesroundedrectanglejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/resources/rounded-rectangle.js (0 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/resources/rounded-rectangle.js                                (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/resources/rounded-rectangle.js        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+function ellipseXIntercept(yi, rx, ry) 
+{
+    return rx * Math.sqrt(1 - (yi * yi) / (ry * ry));
+}
+
+function scanConvertRoundedRectangleOutside(r, height, lineHeight)
+{
+    var intervals = [];
+
+    for (var y = 0; y &lt; height; y += lineHeight) {
+        if (y + lineHeight &lt;= r.y || y &gt;= r.y + r.height)
+            continue;
+
+        if (y + lineHeight &lt; r.y + r.ry) {
+            // within the upper rounded corner of the rectangle
+            var dx = ellipseXIntercept(y + lineHeight - r.y - r.ry, r.rx, r.ry);
+            intervals.push( { y: y, left: r.x + r.rx - dx, right: r.x + r.width - r.rx + dx} );
+        }
+        else if (y &gt; r.y + r.height - r.ry) {
+            // within the lower rounded corner of the rectangle
+            var dx = ellipseXIntercept(y - (r.y + r.height - r.ry), r.rx, r.ry);
+            intervals.push( { y: y, left: r.x + r.rx - dx, right: r.x + r.width - r.rx + dx} );
+        }
+        else // within the rectangle's vertical edges
+            intervals.push( {y: y, left: r.x, right: r.x + r.width} );
+    }
+
+    return intervals;
+}
+
+function genLeftRightRoundedRectFloatShapeOutsideRefTest(args)
+{
+    genLeftRoundedRectFloatShapeOutsideRefTest(args);
+    genRightRoundedRectFloatShapeOutsideRefTest(args);
+}
+
+function genLeftRoundedRectFloatShapeOutsideRefTest(args)
+{
+    var leftRoundedRect = args.roundedRect;
+    var leftRoundedRectIntervals = scanConvertRoundedRectangleOutside(leftRoundedRect, args.containerHeight, args.lineHeight);
+    var leftFloatDivs = leftRoundedRectIntervals.map(function(interval) { 
+        var width = SubPixelLayout.snapToLayoutUnit(interval.right);
+        var cls = &quot;left-&quot; + args.floatElementClassSuffix;
+        return '&lt;div class=&quot;' + cls + '&quot; style=&quot;width:' + width + 'px&quot;&gt;&lt;/div&gt;'; 
+    });
+    document.getElementById(&quot;left-&quot; + args.insertElementIdSuffix).insertAdjacentHTML('afterend', leftFloatDivs.join(&quot;\n&quot;));
+}
+
+function genRightRoundedRectFloatShapeOutsideRefTest(args)
+{
+    var rightRoundedRect = Object.create(args.roundedRect);
+    rightRoundedRect.x = args.containerWidth - args.roundedRect.width;
+    var rightRoundedRectIntervals = scanConvertRoundedRectangleOutside(rightRoundedRect, args.containerHeight, args.lineHeight);
+    var rightFloatDivs = rightRoundedRectIntervals.map(function(interval) { 
+        var width = args.containerWidth - SubPixelLayout.snapToLayoutUnit(interval.left);
+        var cls = &quot;right-&quot; + args.floatElementClassSuffix;
+        return '&lt;div class=&quot;' + cls + '&quot; style=&quot;width:' + width + 'px&quot;&gt;&lt;/div&gt;'; 
+    });
+    document.getElementById(&quot;right-&quot; + args.insertElementIdSuffix).insertAdjacentHTML('afterend', rightFloatDivs.join(&quot;\n&quot;));
+}
</ins></span></pre></div>
<a id="trunkLayoutTestscsswgsubmittedshapesshapeoutsideresourcessubpixelutilsjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/resources/subpixel-utils.js (0 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/resources/subpixel-utils.js                                (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/resources/subpixel-utils.js        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+var SubPixelLayout = (function() {
+    var enabled = undefined;
+
+    function isEnabled()
+    {
+        if (enabled === undefined) {
+            var elem = document.createElement('div');
+            elem.style.setProperty('width', '4.5px');
+            document.body.appendChild(elem);
+            var bounds = elem.getBoundingClientRect();
+            enabled = (bounds.width != Math.floor(bounds.width));
+            document.body.removeChild(elem);
+        }
+        return enabled;
+    }
+
+    return {
+        isEnabled: isEnabled,
+        snapToLayoutUnit: function(f) {
+            return isEnabled() ? Math.floor(f * 64) / 64 : Math.floor(f); // as in LayoutUnit(f).toFloat()
+        },
+        ceilSnapToLayoutUnit: function(f) {
+            return isEnabled() ? Math.ceil(f * 64) / 64 : Math.ceil(f); // see ceiledLayoutUnit(), LayoutUnit.h
+        }
+    }
+}());
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle001expectedhtmlfromrev153062trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle001expectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html (from rev 153062, trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001-expected.html) (0 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html                                (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;title&gt;shape-outside-floats-rounded-rectangle-001-reference.html&lt;/title&gt;
+&lt;link rel=&quot;author&quot; title=&quot;Bem Jones-Bey&quot; href=&quot;mailto:bjonesbe@adobe.com&quot;&gt;
+&lt;meta name=&quot;flags&quot; content=&quot;ahem dom&quot;&gt;
+&lt;style&gt;
+.container {
+    position: relative;
+    font: 20px/1 Ahem, sans-serif;
+    line-height: 20px;
+    width: 500px;
+    height: 200px; 
+    border: 1px solid black;    
+}
+
+.rounded-rect {
+    width: 320px;
+    height: 160px;
+    border-radius: 60px;
+    border: 1px solid blue;
+}
+
+#left-rounded-rect-outline {
+    position: absolute;
+    top: 20px;
+    left: 0px;
+}
+
+#right-rounded-rect-outline {
+    position: absolute;
+    top: 20px;
+    right: 0px;
+}
+
+.left-rounded-rect-float-line {
+    float: left;
+    clear: left;
+    height: 20px;
+}
+
+.right-rounded-rect-float-line {
+    float: right;
+    clear: right;
+    height: 20px;
+}
+&lt;/style&gt;
+
+&lt;body&gt;
+&lt;p&gt;The black squares should trace the right side of the rounded rectangle's blue outline.&lt;/p&gt;
+&lt;div class=&quot;container&quot;&gt;
+X&lt;br/&gt;
+    &lt;div id=&quot;left-rounded-rect-outline&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt; 
+    &lt;!-- generated left-rounded-rect-float-line divs will be inserted here --&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X
+&lt;/div&gt;
+
+&lt;p&gt;The black squares should trace the left side of the rounded rectangle's blue outline.&lt;/p&gt;
+&lt;div class=&quot;container&quot; style=&quot;text-align: right&quot;&gt;
+X&lt;br/&gt;
+    &lt;div id=&quot;right-rounded-rect-outline&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
+    &lt;!-- generated right-rounded-rect-float-line divs will be inserted here --&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X
+&lt;/div&gt;
+&lt;/body&gt;
+
+&lt;script src=&quot;resources/rounded-rectangle.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;resources/subpixel-utils.js&quot;&gt;&lt;/script&gt;
+&lt;script&gt;
+// Note that the border must be added into the width to account for its affect
+// on float positioning.
+genLeftRightRoundedRectFloatShapeOutsideRefTest({
+    roundedRect: {x: 0, y: 20, width: 321, height: 160, rx: 60, ry: 60},
+    containerWidth: 500, 
+    containerHeight: 200,
+    lineHeight: 20,
+    floatElementClassSuffix: &quot;rounded-rect-float-line&quot;,
+    insertElementIdSuffix: &quot;rounded-rect-outline&quot;
+});
+&lt;/script&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle001htmlfromrev153062trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle001html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html (from rev 153062, trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001.html) (0 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html                                (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;title&gt;shape-outside-floats-rounded-rectangle-001.html&lt;/title&gt;
+&lt;link rel=&quot;author&quot; title=&quot;Bem Jones-Bey&quot; href=&quot;mailto:bjonesbe@adobe.com&quot;&gt;
+&lt;link rel=&quot;help&quot; href=&quot;http://dev.w3.org/csswg/css-shapes-1/#shape-outside-property&quot;&gt;
+&lt;link rel=&quot;match&quot; href=&quot;shape-outside-floats-rounded-rectangle-001-reference.html&quot;&gt;
+&lt;meta name=&quot;flags&quot; content=&quot;ahem&quot;&gt;
+&lt;script&gt;
+    if (window.internals)
+        window.internals.settings.setCSSShapesEnabled(true);
+&lt;/script&gt;
+&lt;style&gt;
+.container {
+    font: 20px/1 Ahem, sans-serif;
+    line-height: 20px;
+    width: 500px;
+    height: 200px; 
+    border: 1px solid black;
+}
+
+.rounded-rect {
+    width: 320px;
+    height: 160px;
+    border: 1px solid blue;
+    border-radius: 60px;
+    -webkit-shape-outside: rectangle(0px, 0px, 320px, 160px, 60px, 60px); /* x,y,width,height,rx,ry */
+}
+&lt;/style&gt;
+
+&lt;body&gt;
+&lt;p&gt;The black squares should trace the right side of the rounded rectangle's blue outline.&lt;/p&gt;
+&lt;div class=&quot;container&quot;&gt;
+X&lt;br/&gt;
+    &lt;div style=&quot;float: left&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X
+&lt;/div&gt;
+
+&lt;p&gt;The black squares should trace the left side of the rounded rectangle's blue outline.&lt;/p&gt;
+&lt;div class=&quot;container&quot; style=&quot;text-align: right&quot;&gt;
+X&lt;br/&gt;
+    &lt;div style=&quot;float: right&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X
+&lt;/div&gt;
+&lt;/body&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle002expectedhtmlfromrev153062trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle002expectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html (from rev 153062, trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002-expected.html) (0 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html                                (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;title&gt;shape-outside-floats-rounded-rectangle-002-reference.html&lt;/title&gt;
+&lt;link rel=&quot;author&quot; title=&quot;Bem Jones-Bey&quot; href=&quot;mailto:bjonesbe@adobe.com&quot;&gt;
+&lt;meta name=&quot;flags&quot; content=&quot;ahem dom&quot;&gt;
+&lt;style&gt;
+.container {
+    position: relative;
+    font: 20px/1 Ahem, sans-serif;
+    line-height: 20px;
+    width: 500px;
+    height: 200px; 
+    border: 1px solid black;    
+}
+
+.rounded-rect-circle {
+    width: 160px;
+    height: 160px;
+    border-radius: 80px;
+    border: 1px solid blue;
+}
+
+#left-rounded-rect-circle-outline {
+    position: absolute;
+    top: 20px;
+    left: 0px;
+}
+
+#right-rounded-rect-circle-outline {
+    position: absolute;
+    top: 20px;
+    right: 0px;
+}
+
+.left-rounded-rect-circle-float-line {
+    float: left;
+    clear: left;
+    height: 20px;
+}
+
+.right-rounded-rect-circle-float-line {
+    float: right;
+    clear: right;
+    height: 20px;
+}
+&lt;/style&gt;
+
+&lt;body&gt;
+&lt;p&gt;The black squares should trace the right side of the circle's blue outline.&lt;/p&gt;
+&lt;div class=&quot;container&quot;&gt;
+X&lt;br/&gt;
+    &lt;div id=&quot;left-rounded-rect-circle-outline&quot; class=&quot;rounded-rect-circle&quot;&gt;&lt;/div&gt; 
+    &lt;!-- generated left-rounded-rect-float-line divs will be inserted here --&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X
+&lt;/div&gt;
+
+&lt;p&gt;The black squares should trace the left side of the circle's blue outline.&lt;/p&gt;
+&lt;div class=&quot;container&quot; style=&quot;text-align: right&quot;&gt;
+X&lt;br/&gt;
+    &lt;div id=&quot;right-rounded-rect-circle-outline&quot; class=&quot;rounded-rect-circle&quot;&gt;&lt;/div&gt;
+    &lt;!-- generated right-rounded-rect-float-line divs will be inserted here --&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X
+&lt;/div&gt;
+&lt;/body&gt;
+
+&lt;script src=&quot;resources/rounded-rectangle.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;resources/subpixel-utils.js&quot;&gt;&lt;/script&gt;
+&lt;script&gt;
+// Note that the border must be added into the width to account for its affect
+// on float positioning.
+genLeftRightRoundedRectFloatShapeOutsideRefTest({
+    roundedRect: {x: 0, y: 20, width: 161, height: 160, rx: 80, ry: 80},
+    containerWidth: 500, 
+    containerHeight: 200,
+    lineHeight: 20,
+    floatElementClassSuffix: &quot;rounded-rect-circle-float-line&quot;,
+    insertElementIdSuffix: &quot;rounded-rect-circle-outline&quot;
+});
+&lt;/script&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle002htmlfromrev153062trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle002html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html (from rev 153062, trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002.html) (0 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html                                (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;title&gt;shape-outside-floats-rounded-rectangle-002.html&lt;/title&gt;
+&lt;link rel=&quot;author&quot; title=&quot;Bem Jones-Bey&quot; href=&quot;mailto:bjonesbe@adobe.com&quot;&gt;
+&lt;link rel=&quot;help&quot; href=&quot;http://dev.w3.org/csswg/css-shapes-1/#shape-outside-property&quot;&gt;
+&lt;link rel=&quot;match&quot; href=&quot;shape-outside-floats-rounded-rectangle-002-reference.html&quot;&gt;
+&lt;meta name=&quot;flags&quot; content=&quot;ahem&quot;&gt;
+&lt;script&gt;
+    if (window.internals)
+        window.internals.settings.setCSSShapesEnabled(true);
+&lt;/script&gt;
+&lt;style&gt;
+.container {
+    font: 20px/1 Ahem, sans-serif;
+    line-height: 20px;
+    width: 500px;
+    height: 200px; 
+    border: 1px solid black;
+}
+
+.rounded-rect-circle {
+    width: 160px;
+    height: 160px;
+    border: 1px solid blue;
+    border-radius: 80px;
+    -webkit-shape-outside: rectangle(0px, 0px, 160px, 160px, 80px, 80px); /* x,y,width,height,rx,ry */
+}
+&lt;/style&gt;
+
+&lt;body&gt;
+&lt;p&gt;The black squares should trace the right side of the circle's blue outline.&lt;/p&gt;
+&lt;div class=&quot;container&quot;&gt;
+X&lt;br/&gt;
+    &lt;div style=&quot;float: left&quot; class=&quot;rounded-rect-circle&quot;&gt;&lt;/div&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X
+&lt;/div&gt;
+
+&lt;p&gt;The black squares should trace the left side of the circle's blue outline.&lt;/p&gt;
+&lt;div class=&quot;container&quot; style=&quot;text-align: right&quot;&gt;
+X&lt;br/&gt;
+    &lt;div style=&quot;float: right&quot; class=&quot;rounded-rect-circle&quot;&gt;&lt;/div&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X
+&lt;/div&gt;
+&lt;/body&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle003expectedhtmlfromrev153062trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle003expectedhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html (from rev 153062, trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003-expected.html) (0 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html                                (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;title&gt;shape-outside-floats-rounded-rectangle-003-reference.html&lt;/title&gt;
+&lt;link rel=&quot;author&quot; title=&quot;Bem Jones-Bey&quot; href=&quot;mailto:bjonesbe@adobe.com&quot;&gt;
+&lt;meta name=&quot;flags&quot; content=&quot;ahem dom&quot;&gt;
+&lt;style&gt;
+.container {
+    position: relative;
+    font: 20px/1 Ahem, sans-serif;
+    line-height: 20px;
+    width: 500px;
+    height: 200px; 
+    border: 1px solid black;    
+}
+
+.rounded-rect-ellipse {
+    width: 320px;
+    height: 160px;
+    border-radius: 160px / 80px;
+    border: 1px solid blue;
+}
+
+#left-rounded-rect-ellipse-outline {
+    position: absolute;
+    top: 20px;
+    left: 0px;
+}
+
+#right-rounded-rect-ellipse-outline {
+    position: absolute;
+    top: 20px;
+    right: 0px;
+}
+
+.left-rounded-rect-ellipse-float-line {
+    float: left;
+    clear: left;
+    height: 20px;
+}
+
+.right-rounded-rect-ellipse-float-line {
+    float: right;
+    clear: right;
+    height: 20px;
+}
+&lt;/style&gt;
+
+&lt;body&gt;
+&lt;p&gt;The black squares should trace the right side of the ellipse's blue outline.&lt;/p&gt;
+&lt;div class=&quot;container&quot;&gt;
+X&lt;br/&gt;
+    &lt;div id=&quot;left-rounded-rect-ellipse-outline&quot; class=&quot;rounded-rect-ellipse&quot;&gt;&lt;/div&gt; 
+    &lt;!-- generated left-rounded-rect-float-line divs will be inserted here --&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X
+&lt;/div&gt;
+
+&lt;p&gt;The black squares should trace the left side of the ellipse's blue outline.&lt;/p&gt;
+&lt;div class=&quot;container&quot; style=&quot;text-align: right&quot;&gt;
+X&lt;br/&gt;
+    &lt;div id=&quot;right-rounded-rect-ellipse-outline&quot; class=&quot;rounded-rect-ellipse&quot;&gt;&lt;/div&gt;
+    &lt;!-- generated right-rounded-rect-float-line divs will be inserted here --&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X
+&lt;/div&gt;
+&lt;/body&gt;
+
+&lt;script src=&quot;resources/rounded-rectangle.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;resources/subpixel-utils.js&quot;&gt;&lt;/script&gt;
+&lt;script&gt;
+// Note that the border must be added into the width to account for its affect
+// on float positioning.
+genLeftRightRoundedRectFloatShapeOutsideRefTest({
+    roundedRect: {x: 0, y: 20, width: 321, height: 160, rx: 160, ry: 80},
+    containerWidth: 500, 
+    containerHeight: 200,
+    lineHeight: 20,
+    floatElementClassSuffix: &quot;rounded-rect-ellipse-float-line&quot;,
+    insertElementIdSuffix: &quot;rounded-rect-ellipse-outline&quot;
+});
+&lt;/script&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle003htmlfromrev153062trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle003html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html (from rev 153062, trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003.html) (0 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html                                (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;title&gt;shape-outside-floats-rounded-rectangle-003.html&lt;/title&gt;
+&lt;link rel=&quot;author&quot; title=&quot;Bem Jones-Bey&quot; href=&quot;mailto:bjonesbe@adobe.com&quot;&gt;
+&lt;link rel=&quot;help&quot; href=&quot;http://dev.w3.org/csswg/css-shapes-1/#shape-outside-property&quot;&gt;
+&lt;link rel=&quot;match&quot; href=&quot;shape-outside-floats-rounded-rectangle-003-reference.html&quot;&gt;
+&lt;meta name=&quot;flags&quot; content=&quot;ahem&quot;&gt;
+&lt;script&gt;
+    if (window.internals)
+        window.internals.settings.setCSSShapesEnabled(true);
+&lt;/script&gt;
+&lt;style&gt;
+.container {
+    font: 20px/1 Ahem, sans-serif;
+    line-height: 20px;
+    width: 500px;
+    height: 200px; 
+    border: 1px solid black;
+}
+
+.rounded-rect-ellipse {
+    width: 320px;
+    height: 160px;
+    border: 1px solid blue;
+    border-radius: 160px / 80px;
+    -webkit-shape-outside: rectangle(0px, 0px, 320px, 160px, 160px, 80px); /* x,y,width,height,rx,ry */
+}
+&lt;/style&gt;
+
+&lt;body&gt;
+&lt;p&gt;The black squares should trace the right side of the ellipse's blue outline.&lt;/p&gt;
+&lt;div class=&quot;container&quot;&gt;
+X&lt;br/&gt;
+    &lt;div style=&quot;float: left&quot; class=&quot;rounded-rect-ellipse&quot;&gt;&lt;/div&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X
+&lt;/div&gt;
+
+&lt;p&gt;The black squares should trace the left side of the ellipse's blue outline.&lt;/p&gt;
+&lt;div class=&quot;container&quot; style=&quot;text-align: right&quot;&gt;
+X&lt;br/&gt;
+    &lt;div style=&quot;float: right&quot; class=&quot;rounded-rect-ellipse&quot;&gt;&lt;/div&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X&lt;br/&gt;
+X
+&lt;/div&gt;
+&lt;/body&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle004expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html (0 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html                                (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -0,0 +1,96 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;title&gt;shape-outside-floats-rounded-rectangle-004-reference.html&lt;/title&gt;
+&lt;link rel=&quot;author&quot; title=&quot;Bem Jones-Bey&quot; href=&quot;mailto:bjonesbe@adobe.com&quot;&gt;
+&lt;meta name=&quot;flags&quot; content=&quot;ahem dom&quot;&gt;
+&lt;style&gt;
+.container {
+    position: relative;
+    font: 10px/1 Ahem, sans-serif;
+    width: 80px;
+    height: 40px;
+    border: 1px solid black;
+    margin: 5px;
+}
+.rounded-rect {
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    width: 40px;
+    height: 40px;
+    border: 1px solid blue;
+    border-radius: 50%;
+}
+.left-rounded-rect-float-line {
+    float: left;
+    clear: left;
+    height: 10px;
+}
+&lt;/style&gt;
+&lt;body&gt;
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div id=&quot;left-fixed-units&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X
+    &lt;/div&gt;
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div id=&quot;left-relative-units&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X
+    &lt;/div&gt;
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div id=&quot;left-different-units&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X
+    &lt;/div&gt;
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div id=&quot;left-edge-case&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X
+    &lt;/div&gt;
+    &lt;script src=&quot;resources/rounded-rectangle.js&quot;&gt;&lt;/script&gt;
+    &lt;script src=&quot;resources/subpixel-utils.js&quot;&gt;&lt;/script&gt;
+    &lt;script&gt;
+    // Note that the border must be added into the width to account for its
+    // affect on float positioning.
+    genLeftRoundedRectFloatShapeOutsideRefTest({
+        roundedRect: {x: 0, y: 0, width: 41, height: 40, rx: 20, ry: 20},
+        containerWidth: 80, 
+        containerHeight: 40,
+        lineHeight: 10,
+        floatElementClassSuffix: &quot;rounded-rect-float-line&quot;,
+        insertElementIdSuffix: &quot;fixed-units&quot;
+    });
+    genLeftRoundedRectFloatShapeOutsideRefTest({
+        roundedRect: {x: 0, y: 0, width: 41, height: 40, rx: 20, ry: 20},
+        containerWidth: 80, 
+        containerHeight: 40,
+        lineHeight: 10,
+        floatElementClassSuffix: &quot;rounded-rect-float-line&quot;,
+        insertElementIdSuffix: &quot;relative-units&quot;
+    });
+    genLeftRoundedRectFloatShapeOutsideRefTest({
+        roundedRect: {x: 0, y: 0, width: 41, height: 40, rx: 20, ry: 20},
+        containerWidth: 80, 
+        containerHeight: 40,
+        lineHeight: 10,
+        floatElementClassSuffix: &quot;rounded-rect-float-line&quot;,
+        insertElementIdSuffix: &quot;different-units&quot;
+    });
+    genLeftRoundedRectFloatShapeOutsideRefTest({
+        roundedRect: {x: 0, y: 0, width: 41, height: 40, rx: 20, ry: 20},
+        containerWidth: 80, 
+        containerHeight: 40,
+        lineHeight: 10,
+        floatElementClassSuffix: &quot;rounded-rect-float-line&quot;,
+        insertElementIdSuffix: &quot;edge-case&quot;
+    });
+    &lt;/script&gt;
+&lt;/body&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestscsswgsubmittedshapesshapeoutsideshapeoutsidefloatsroundedrectangle004html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html (0 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html                                (rev 0)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;title&gt;CSS Test: rounded rectangle shape-outside on floats with clamped radii values&lt;/title&gt;
+&lt;link rel=&quot;author&quot; title=&quot;Bem Jones-Bey&quot; href=&quot;mailto:bjonesbe@adobe.com&quot;&gt;
+&lt;link rel=&quot;help&quot; href=&quot;http://dev.w3.org/csswg/css-shapes-1/#shape-outside-property&quot;&gt;
+&lt;link rel=&quot;match&quot; href=&quot;shape-outside-floats-rounded-rectangle-004-reference.html&quot;&gt;
+&lt;meta name=&quot;flags&quot; content=&quot;ahem&quot;&gt;
+&lt;script&gt;
+// This is required to run the tests in WebKit's test infrastructure.
+if (window.internals)
+    window.internals.settings.setCSSShapesEnabled(true);
+&lt;/script&gt;
+&lt;style&gt;
+.container {
+    font: 10px/1 Ahem, sans-serif;
+    width: 80px;
+    height: 40px;
+    border: 1px solid black;
+    margin: 5px;
+}
+.float {
+    float: left;
+    width: 40px;
+    height: 40px;
+    border: 1px solid blue;
+    border-radius: 50%;
+}
+.fixed-units {
+    -webkit-shape-outside: rectangle(0px, 0px, 40px, 40px, 40px, 40px);
+}
+.different-units {
+    -webkit-shape-outside: rectangle(0px, 0px, 40px, 40px, 100%, 100%);
+}
+.relative-units {
+    -webkit-shape-outside: rectangle(0px, 0px, 100%, 100%, 700em, 700em);
+}
+.edge-case {
+    -webkit-shape-outside: rectangle(0px, 0px, 100%, 100%, 50%, 50%);
+}
+&lt;/style&gt;
+&lt;body&gt;
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;float fixed-units&quot;&gt;&lt;/div&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X
+    &lt;/div&gt;
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;float relative-units&quot;&gt;&lt;/div&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X
+    &lt;/div&gt;
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;float different-units&quot;&gt;&lt;/div&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X
+    &lt;/div&gt;
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;float edge-case&quot;&gt;&lt;/div&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X&lt;br/&gt;
+        X
+    &lt;/div&gt;
+&lt;/body&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestscsswgsubmittedshapesshapeoutsidew3cimportlog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log (153062 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log        2013-07-23 21:53:33 UTC (rev 153062)
+++ trunk/LayoutTests/csswg/submitted/shapes/shape-outside/w3c-import.log        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> Do NOT modify or remove this file
</span><span class="cx"> 
</span><span class="cx"> ------------------------------------------------------------------------
</span><del>-Last Import: 2013-07-17 17:23
</del><ins>+Last Import: 2013-07-23 13:57
</ins><span class="cx"> W3C Mercurial changeset: Not Available
</span><span class="cx"> Test status at time of import: unknown
</span><span class="cx"> ------------------------------------------------------------------------
</span><span class="lines">@@ -17,19 +17,29 @@
</span><span class="cx"> -webkit-writing-mode
</span><span class="cx"> ------------------------------------------------------------------------
</span><span class="cx"> List of files:
</span><del>-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000-expected.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001-expected.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002-expected.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-square-000-expected.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-square-000.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-square-border-000-expected.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000-expected.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001-expected.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002-expected.html
-/LayoutTests/w3c/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002.html
</del><ins>+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-000.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-001.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-horizontal-rectangle-002.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-square-000-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-square-000.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-square-border-000-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-square-border-000.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-000.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-001.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-vertical-rectangle-002.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-001.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-002.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-003.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004-expected.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/shape-outside-floats-rounded-rectangle-004.html
+/LayoutTests/csswg/submitted/shapes/shape-outside/resources/rounded-rectangle.js
+/LayoutTests/csswg/submitted/shapes/shape-outside/resources/subpixel-utils.js
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsroundedrectanglelargeradiusexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-rounded-rectangle-large-radius-expected.html (153062 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-rounded-rectangle-large-radius-expected.html        2013-07-23 21:53:33 UTC (rev 153062)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-rounded-rectangle-large-radius-expected.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -1,97 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-    &lt;head&gt;
-        &lt;style&gt;
-        .container {
-            position: relative;
-            font: 10px/1 Ahem, sans-serif;
-            width: 80px;
-            height: 40px;
-            border: 1px solid black;
-        }
-        .rounded-rect {
-            position: absolute;
-            top: 0px;
-            left: 0px;
-            width: 40px;
-            height: 40px;
-            border: 1px solid blue;
-            border-radius: 50%;
-            margin: -1px; /* shape-outside layout is unaffected by the border */
-        }
-        .left-rounded-rect-float-line {
-            float: left;
-            clear: left;
-            height: 10px;
-        }
-        &lt;/style&gt;
-    &lt;/head&gt;
-    &lt;body&gt;
-        &lt;h1&gt;Bug &lt;a href=&quot;https://bugs.webkit.org/show_bug.cgi?id=116745&quot;&gt;116745&lt;/a&gt;: [CSS Shapes] rectangle and inset-rectangle do not properly handle rx and ry&lt;/h1&gt;
-        &lt;h2&gt;Test that if rx &gt; 50% width and ry &gt; %50 height, they are properly clamped to 50% of the respective dimension when doing layout on the shape. All of the following tests should look identical, and the black blocks should wrap around the blue circle.&lt;/h2&gt;
-        &lt;div class=&quot;container&quot;&gt;
-            &lt;div id=&quot;left-fixed-units&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X
-        &lt;/div&gt;
-        &lt;div class=&quot;container&quot;&gt;
-            &lt;div id=&quot;left-relative-units&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X
-        &lt;/div&gt;
-        &lt;div class=&quot;container&quot;&gt;
-            &lt;div id=&quot;left-different-units&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X
-        &lt;/div&gt;
-        &lt;div class=&quot;container&quot;&gt;
-            &lt;div id=&quot;left-edge-case&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X
-        &lt;/div&gt;
-        &lt;script src=&quot;../resources/rounded-rectangle.js&quot;&gt;&lt;/script&gt;
-        &lt;script src=&quot;../resources/subpixel-utils.js&quot;&gt;&lt;/script&gt;
-        &lt;script&gt;
-        genLeftRoundedRectFloatShapeOutsideRefTest({
-            roundedRect: {x: 0, y: 0, width: 40, height: 40, rx: 20, ry: 20},
-            containerWidth: 80, 
-            containerHeight: 40,
-            lineHeight: 10,
-            floatElementClassSuffix: &quot;rounded-rect-float-line&quot;,
-            insertElementIdSuffix: &quot;fixed-units&quot;
-        });
-        genLeftRoundedRectFloatShapeOutsideRefTest({
-            roundedRect: {x: 0, y: 0, width: 40, height: 40, rx: 20, ry: 20},
-            containerWidth: 80, 
-            containerHeight: 40,
-            lineHeight: 10,
-            floatElementClassSuffix: &quot;rounded-rect-float-line&quot;,
-            insertElementIdSuffix: &quot;relative-units&quot;
-        });
-        genLeftRoundedRectFloatShapeOutsideRefTest({
-            roundedRect: {x: 0, y: 0, width: 40, height: 40, rx: 20, ry: 20},
-            containerWidth: 80, 
-            containerHeight: 40,
-            lineHeight: 10,
-            floatElementClassSuffix: &quot;rounded-rect-float-line&quot;,
-            insertElementIdSuffix: &quot;different-units&quot;
-        });
-        genLeftRoundedRectFloatShapeOutsideRefTest({
-            roundedRect: {x: 0, y: 0, width: 40, height: 40, rx: 20, ry: 20},
-            containerWidth: 80, 
-            containerHeight: 40,
-            lineHeight: 10,
-            floatElementClassSuffix: &quot;rounded-rect-float-line&quot;,
-            insertElementIdSuffix: &quot;edge-case&quot;
-        });
-        &lt;/script&gt;
-    &lt;/body&gt;
-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsroundedrectanglelargeradiushtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-rounded-rectangle-large-radius.html (153062 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-rounded-rectangle-large-radius.html        2013-07-23 21:53:33 UTC (rev 153062)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-rounded-rectangle-large-radius.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -1,68 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-    &lt;head&gt;
-        &lt;script&gt;
-            if (window.internals)
-                window.internals.settings.setCSSExclusionsEnabled(true);
-        &lt;/script&gt;
-        &lt;style&gt;
-        .container {
-            font: 10px/1 Ahem, sans-serif;
-            width: 80px;
-            height: 40px;
-            border: 1px solid black;
-        }
-        .float {
-            float: left;
-            width: 40px;
-            height: 40px;
-            border: 1px solid blue;
-            border-radius: 50%;
-        }
-        .fixed-units {
-            -webkit-shape-outside: rectangle(0px, 0px, 40px, 40px, 40px, 40px);
-        }
-        .different-units {
-            -webkit-shape-outside: rectangle(0px, 0px, 40px, 40px, 100%, 100%);
-        }
-        .relative-units {
-            -webkit-shape-outside: rectangle(0px, 0px, 100%, 100%, 700em, 700em);
-        }
-        .edge-case {
-            -webkit-shape-outside: rectangle(0px, 0px, 100%, 100%, 50%, 50%);
-        }
-        &lt;/style&gt;
-    &lt;/head&gt;
-    &lt;body&gt;
-        &lt;h1&gt;Bug &lt;a href=&quot;https://bugs.webkit.org/show_bug.cgi?id=116745&quot;&gt;116745&lt;/a&gt;: [CSS Shapes] rectangle and inset-rectangle do not properly handle rx and ry&lt;/h1&gt;
-        &lt;h2&gt;Test that if rx &gt; 50% width and ry &gt; %50 height, they are properly clamped to 50% of the respective dimension when doing layout on the shape. All of the following tests should look identical, and the black blocks should wrap around the blue circle.&lt;/h2&gt;
-        &lt;div class=&quot;container&quot;&gt;
-            &lt;div class=&quot;float fixed-units&quot;&gt;&lt;/div&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X
-        &lt;/div&gt;
-        &lt;div class=&quot;container&quot;&gt;
-            &lt;div class=&quot;float relative-units&quot;&gt;&lt;/div&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X
-        &lt;/div&gt;
-        &lt;div class=&quot;container&quot;&gt;
-            &lt;div class=&quot;float different-units&quot;&gt;&lt;/div&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X
-        &lt;/div&gt;
-        &lt;div class=&quot;container&quot;&gt;
-            &lt;div class=&quot;float edge-case&quot;&gt;&lt;/div&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X&lt;br/&gt;
-            X
-        &lt;/div&gt;
-    &lt;/body&gt;
-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle001expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001-expected.html (153062 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001-expected.html        2013-07-23 21:53:33 UTC (rev 153062)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001-expected.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -1,95 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;style&gt;
-.container {
-    position: relative;
-    font: 20px/1 Ahem, sans-serif;
-    width: 500px;
-    height: 200px; 
-    border: 1px solid black;    
-}
-
-.rounded-rect {
-    width: 320px;
-    height: 160px;
-    border-radius: 60px;
-    border: 1px solid blue;
-    margin: -1px; /* shape-outside layout is unaffected by the border */
-}
-
-#left-rounded-rect-outline {
-    position: absolute;
-    top: 20px;
-    left: 0px;
-}
-
-#right-rounded-rect-outline {
-    position: absolute;
-    top: 20px;
-    left: 180px;
-}
-
-.left-rounded-rect-float-line {
-    float: left;
-    clear: left;
-    height: 20px;
-}
-
-.right-rounded-rect-float-line {
-    float: right;
-    clear: right;
-    height: 20px;
-}
-&lt;/style&gt;
-
-&lt;h2&gt;&lt;a href=&quot;https://bugs.webkit.org/show_bug.cgi?id=100299&quot;&gt;Bug 100299&lt;/a&gt; - [CSS Exclusions] shape-outside on floats for rounded rectangle shapes&lt;/h2&gt;
-&lt;p&gt;The black squares should trace the right side of the rounded rectangle's blue outline.&lt;/p&gt;
-&lt;div class=&quot;container&quot;&gt;
-X&lt;br/&gt;
-    &lt;div id=&quot;left-rounded-rect-outline&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt; 
-    &lt;!-- generated left-rounded-rect-float-line divs will be inserted here --&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X
-&lt;/div&gt;
-
-&lt;p&gt;The black squares should trace the left side of the rounded rectangle's blue outline.&lt;/p&gt;
-&lt;div class=&quot;container&quot; style=&quot;text-align: right&quot;&gt;
-X&lt;br/&gt;
-    &lt;div id=&quot;right-rounded-rect-outline&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
-    &lt;!-- generated right-rounded-rect-float-line divs will be inserted here --&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X
-&lt;/div&gt;
-&lt;/body&gt;
-
-&lt;script src=&quot;../resources/rounded-rectangle.js&quot;&gt;&lt;/script&gt;
-&lt;script src=&quot;../resources/subpixel-utils.js&quot;&gt;&lt;/script&gt;
-&lt;script&gt;
-genLeftRightRoundedRectFloatShapeOutsideRefTest({
-    roundedRect: {x: 0, y: 20, width: 320, height: 160, rx: 60, ry: 60},
-    containerWidth: 500, 
-    containerHeight: 200,
-    lineHeight: 20,
-    floatElementClassSuffix: &quot;rounded-rect-float-line&quot;,
-    insertElementIdSuffix: &quot;rounded-rect-outline&quot;
-});
-&lt;/script&gt;
-
-&lt;/html&gt;
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle001html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001.html (153062 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001.html        2013-07-23 21:53:33 UTC (rev 153062)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-001.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;script&gt;
-    if (window.internals)
-        window.internals.settings.setCSSShapesEnabled(true);
-&lt;/script&gt;
-&lt;style&gt;
-.container {
-    font: 20px/1 Ahem, sans-serif;
-    width: 500px;
-    height: 200px; 
-    border: 1px solid black;
-}
-
-.rounded-rect {
-    width: 320px;
-    height: 160px;
-    border: 1px solid blue;
-    border-radius: 60px;
-    -webkit-shape-outside: rectangle(0px, 0px, 320px, 160px, 60px, 60px); /* x,y,width,height,rx,ry */
-}
-&lt;/style&gt;
-
-&lt;h2&gt;&lt;a href=&quot;https://bugs.webkit.org/show_bug.cgi?id=100299&quot;&gt;Bug 100299&lt;/a&gt; - [CSS Exclusions] shape-outside on floats for rounded rectangle shapes&lt;/h2&gt;
-&lt;p&gt;The black squares should trace the right side of the rounded rectangle's blue outline.&lt;/p&gt;
-&lt;div class=&quot;container&quot;&gt;
-X&lt;br/&gt;
-    &lt;div style=&quot;float: left&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X
-&lt;/div&gt;
-
-&lt;p&gt;The black squares should trace the left side of the rounded rectangle's blue outline.&lt;/p&gt;
-&lt;div class=&quot;container&quot; style=&quot;text-align: right&quot;&gt;
-X&lt;br/&gt;
-    &lt;div style=&quot;float: right&quot; class=&quot;rounded-rect&quot;&gt;&lt;/div&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X
-&lt;/div&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle002expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002-expected.html (153062 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002-expected.html        2013-07-23 21:53:33 UTC (rev 153062)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002-expected.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -1,95 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;style&gt;
-.container {
-    position: relative;
-    font: 20px/1 Ahem, sans-serif;
-    width: 500px;
-    height: 200px; 
-    border: 1px solid black;    
-}
-
-.rounded-rect-circle {
-    width: 160px;
-    height: 160px;
-    border-radius: 80px;
-    border: 1px solid blue;
-    margin: -1px; /* shape-outside layout is unaffected by the border */
-}
-
-#left-rounded-rect-circle-outline {
-    position: absolute;
-    top: 20px;
-    left: 0px;
-}
-
-#right-rounded-rect-circle-outline {
-    position: absolute;
-    top: 20px;
-    left: 340px;
-}
-
-.left-rounded-rect-circle-float-line {
-    float: left;
-    clear: left;
-    height: 20px;
-}
-
-.right-rounded-rect-circle-float-line {
-    float: right;
-    clear: right;
-    height: 20px;
-}
-&lt;/style&gt;
-
-&lt;h2&gt;&lt;a href=&quot;https://bugs.webkit.org/show_bug.cgi?id=100299&quot;&gt;Bug 100299&lt;/a&gt; - [CSS Exclusions] shape-outside on floats for rounded rectangle shapes&lt;/h2&gt;
-&lt;p&gt;The black squares should trace the right side of the circle's blue outline.&lt;/p&gt;
-&lt;div class=&quot;container&quot;&gt;
-X&lt;br/&gt;
-    &lt;div id=&quot;left-rounded-rect-circle-outline&quot; class=&quot;rounded-rect-circle&quot;&gt;&lt;/div&gt; 
-    &lt;!-- generated left-rounded-rect-float-line divs will be inserted here --&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X
-&lt;/div&gt;
-
-&lt;p&gt;The black squares should trace the left side of the circle's blue outline.&lt;/p&gt;
-&lt;div class=&quot;container&quot; style=&quot;text-align: right&quot;&gt;
-X&lt;br/&gt;
-    &lt;div id=&quot;right-rounded-rect-circle-outline&quot; class=&quot;rounded-rect-circle&quot;&gt;&lt;/div&gt;
-    &lt;!-- generated right-rounded-rect-float-line divs will be inserted here --&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X
-&lt;/div&gt;
-&lt;/body&gt;
-
-&lt;script src=&quot;../resources/rounded-rectangle.js&quot;&gt;&lt;/script&gt;
-&lt;script src=&quot;../resources/subpixel-utils.js&quot;&gt;&lt;/script&gt;
-&lt;script&gt;
-genLeftRightRoundedRectFloatShapeOutsideRefTest({
-    roundedRect: {x: 0, y: 20, width: 160, height: 160, rx: 80, ry: 80},
-    containerWidth: 500, 
-    containerHeight: 200,
-    lineHeight: 20,
-    floatElementClassSuffix: &quot;rounded-rect-circle-float-line&quot;,
-    insertElementIdSuffix: &quot;rounded-rect-circle-outline&quot;
-});
-&lt;/script&gt;
-
-&lt;/html&gt;
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle002html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002.html (153062 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002.html        2013-07-23 21:53:33 UTC (rev 153062)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-002.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;script&gt;
-    if (window.internals)
-        window.internals.settings.setCSSShapesEnabled(true);
-&lt;/script&gt;
-&lt;style&gt;
-.container {
-    font: 20px/1 Ahem, sans-serif;
-    width: 500px;
-    height: 200px; 
-    border: 1px solid black;
-}
-
-.rounded-rect-circle {
-    width: 160px;
-    height: 160px;
-    border: 1px solid blue;
-    border-radius: 80px;
-    -webkit-shape-outside: rectangle(0px, 0px, 160px, 160px, 80px, 80px); /* x,y,width,height,rx,ry */
-}
-&lt;/style&gt;
-
-&lt;h2&gt;&lt;a href=&quot;https://bugs.webkit.org/show_bug.cgi?id=100299&quot;&gt;Bug 100299&lt;/a&gt; - [CSS Exclusions] shape-outside on floats for rounded rectangle shapes&lt;/h2&gt;
-&lt;p&gt;The black squares should trace the right side of the circle's blue outline.&lt;/p&gt;
-&lt;div class=&quot;container&quot;&gt;
-X&lt;br/&gt;
-    &lt;div style=&quot;float: left&quot; class=&quot;rounded-rect-circle&quot;&gt;&lt;/div&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X
-&lt;/div&gt;
-
-&lt;p&gt;The black squares should trace the left side of the circle's blue outline.&lt;/p&gt;
-&lt;div class=&quot;container&quot; style=&quot;text-align: right&quot;&gt;
-X&lt;br/&gt;
-    &lt;div style=&quot;float: right&quot; class=&quot;rounded-rect-circle&quot;&gt;&lt;/div&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X
-&lt;/div&gt;
-&lt;/body&gt;
-&lt;/html&gt;
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle003expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003-expected.html (153062 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003-expected.html        2013-07-23 21:53:33 UTC (rev 153062)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003-expected.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -1,95 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;style&gt;
-.container {
-    position: relative;
-    font: 20px/1 Ahem, sans-serif;
-    width: 500px;
-    height: 200px; 
-    border: 1px solid black;    
-}
-
-.rounded-rect-ellipse {
-    width: 320px;
-    height: 160px;
-    border-radius: 160px / 80px;
-    border: 1px solid blue;
-    margin: -1px; /* shape-outside layout is unaffected by the border */
-}
-
-#left-rounded-rect-ellipse-outline {
-    position: absolute;
-    top: 20px;
-    left: 0px;
-}
-
-#right-rounded-rect-ellipse-outline {
-    position: absolute;
-    top: 20px;
-    left: 180px;
-}
-
-.left-rounded-rect-ellipse-float-line {
-    float: left;
-    clear: left;
-    height: 20px;
-}
-
-.right-rounded-rect-ellipse-float-line {
-    float: right;
-    clear: right;
-    height: 20px;
-}
-&lt;/style&gt;
-
-&lt;h2&gt;&lt;a href=&quot;https://bugs.webkit.org/show_bug.cgi?id=100299&quot;&gt;Bug 100299&lt;/a&gt; - [CSS Exclusions] shape-outside on floats for rounded rectangle shapes&lt;/h2&gt;
-&lt;p&gt;The black squares should trace the right side of the ellipse's blue outline.&lt;/p&gt;
-&lt;div class=&quot;container&quot;&gt;
-X&lt;br/&gt;
-    &lt;div id=&quot;left-rounded-rect-ellipse-outline&quot; class=&quot;rounded-rect-ellipse&quot;&gt;&lt;/div&gt; 
-    &lt;!-- generated left-rounded-rect-float-line divs will be inserted here --&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X
-&lt;/div&gt;
-
-&lt;p&gt;The black squares should trace the left side of the ellipse's blue outline.&lt;/p&gt;
-&lt;div class=&quot;container&quot; style=&quot;text-align: right&quot;&gt;
-X&lt;br/&gt;
-    &lt;div id=&quot;right-rounded-rect-ellipse-outline&quot; class=&quot;rounded-rect-ellipse&quot;&gt;&lt;/div&gt;
-    &lt;!-- generated right-rounded-rect-float-line divs will be inserted here --&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X
-&lt;/div&gt;
-&lt;/body&gt;
-
-&lt;script src=&quot;../resources/rounded-rectangle.js&quot;&gt;&lt;/script&gt;
-&lt;script src=&quot;../resources/subpixel-utils.js&quot;&gt;&lt;/script&gt;
-&lt;script&gt;
-genLeftRightRoundedRectFloatShapeOutsideRefTest({
-    roundedRect: {x: 0, y: 20, width: 320, height: 160, rx: 160, ry: 80},
-    containerWidth: 500, 
-    containerHeight: 200,
-    lineHeight: 20,
-    floatElementClassSuffix: &quot;rounded-rect-ellipse-float-line&quot;,
-    insertElementIdSuffix: &quot;rounded-rect-ellipse-outline&quot;
-});
-&lt;/script&gt;
-
-&lt;/html&gt;
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatssimpleroundedrectangle003html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003.html (153062 => 153063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003.html        2013-07-23 21:53:33 UTC (rev 153062)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-simple-rounded-rectangle-003.html        2013-07-23 22:20:55 UTC (rev 153063)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;script&gt;
-    if (window.internals)
-        window.internals.settings.setCSSShapesEnabled(true);
-&lt;/script&gt;
-&lt;style&gt;
-.container {
-    font: 20px/1 Ahem, sans-serif;
-    width: 500px;
-    height: 200px; 
-    border: 1px solid black;
-}
-
-.rounded-rect-ellipse {
-    width: 320px;
-    height: 160px;
-    border: 1px solid blue;
-    border-radius: 160px / 80px;
-    -webkit-shape-outside: rectangle(0px, 0px, 320px, 160px, 160px, 80px); /* x,y,width,height,rx,ry */
-}
-&lt;/style&gt;
-
-&lt;h2&gt;&lt;a href=&quot;https://bugs.webkit.org/show_bug.cgi?id=100299&quot;&gt;Bug 100299&lt;/a&gt; - [CSS Exclusions] shape-outside on floats for rounded rectangle shapes&lt;/h2&gt;
-&lt;p&gt;The black squares should trace the right side of the ellipse's blue outline.&lt;/p&gt;
-&lt;div class=&quot;container&quot;&gt;
-X&lt;br/&gt;
-    &lt;div style=&quot;float: left&quot; class=&quot;rounded-rect-ellipse&quot;&gt;&lt;/div&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X
-&lt;/div&gt;
-
-&lt;p&gt;The black squares should trace the left side of the ellipse's blue outline.&lt;/p&gt;
-&lt;div class=&quot;container&quot; style=&quot;text-align: right&quot;&gt;
-X&lt;br/&gt;
-    &lt;div style=&quot;float: right&quot; class=&quot;rounded-rect-ellipse&quot;&gt;&lt;/div&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X&lt;br/&gt;
-X
-&lt;/div&gt;
-&lt;/body&gt;
-&lt;/html&gt;
</del></span></pre>
</div>
</div>

</body>
</html>