<!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>[166383] trunk</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/166383">166383</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-03-27 16:40:04 -0700 (Thu, 27 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes][css clip-path] rounded corner calculation for box shapes is wrong
https://bugs.webkit.org/show_bug.cgi?id=127982
Reviewed by Simon Fraser.
Source/WebCore:
Calculate rounded corners for box shapes as defined in the CSS Shapes
spec.
Tests: css3/masking/clip-path-border-radius-border-box-000.html
css3/masking/clip-path-border-radius-content-box-000.html
css3/masking/clip-path-border-radius-content-box-001.html
css3/masking/clip-path-border-radius-padding-box-000.html
css3/masking/clip-path-border-radius-padding-box-001.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002.html
fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003.html
* platform/graphics/RoundedRect.h:
(WebCore::RoundedRect::Radii::transposedRadii): Transpose radii for
vertical writing modes.
(WebCore::RoundedRect::moveBy): Add method for use with clip path.
(WebCore::RoundedRect::transposedRect): Transpose rect for vertical
writing modes.
* rendering/RenderBox.h:
(WebCore::RenderBox::marginBoxRect): Return the margin box rect for
the RenderBox.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::setupClipPath): Call the new function for the
rounded corner calculation.
* rendering/shapes/ShapeInfo.cpp:
(WebCore::ShapeInfo<RenderType>::computedShape): Call the new function
for the rounded corner calculation.
* rendering/shapes/BoxShape.cpp:
(WebCore::adjustRadiusForMarginBoxShape): Helper function for
computeRoundedRectForLayoutBoxShape.
(WebCore::computeMarginBoxShapeRadius): Ditto.
(WebCore::computeMarginBoxShapeRadii): Ditto.
(WebCore::computeRoundedRectForBoxShape): Utility function to do the
rounded corner calculation.
* rendering/shapes/BoxShape.h: Add new function.
* rendering/style/RenderStyle.h:
(WebCore::RenderStyle::getRoundedInnerBorderFor): Add default argument
values.
LayoutTests:
* css3/masking/clip-path-border-radius-border-box-000-expected.html: Added.
* css3/masking/clip-path-border-radius-border-box-000.html: Added.
* css3/masking/clip-path-border-radius-content-box-000-expected.html: Added.
* css3/masking/clip-path-border-radius-content-box-000.html: Added.
* css3/masking/clip-path-border-radius-content-box-001-expected.html: Added.
* css3/masking/clip-path-border-radius-content-box-001.html: Added.
* css3/masking/clip-path-border-radius-padding-box-000-expected.html: Added.
* css3/masking/clip-path-border-radius-padding-box-000.html: Added.
* css3/masking/clip-path-border-radius-padding-box-001-expected.html: Added.
* css3/masking/clip-path-border-radius-padding-box-001.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsRoundedRecth">trunk/Source/WebCore/platform/graphics/RoundedRect.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesBoxShapecpp">trunk/Source/WebCore/rendering/shapes/BoxShape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesBoxShapeh">trunk/Source/WebCore/rendering/shapes/BoxShape.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3maskingclippathborderradiusborderbox000expectedhtml">trunk/LayoutTests/css3/masking/clip-path-border-radius-border-box-000-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathborderradiusborderbox000html">trunk/LayoutTests/css3/masking/clip-path-border-radius-border-box-000.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathborderradiuscontentbox000expectedhtml">trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-000-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathborderradiuscontentbox000html">trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-000.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathborderradiuscontentbox001expectedhtml">trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-001-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathborderradiuscontentbox001html">trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-001.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathborderradiuspaddingbox000expectedhtml">trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-000-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathborderradiuspaddingbox000html">trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-000.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathborderradiuspaddingbox001expectedhtml">trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-001-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathborderradiuspaddingbox001html">trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-001.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusborderbox000expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusborderbox000html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusborderbox001expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusborderbox001html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusborderbox002expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusborderbox002html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox000expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox000html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox001expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox001html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox002expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox002html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox003expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox003html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox000expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox000html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox001expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox001html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox002expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox002html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox003expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox003html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox004expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox004html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox000expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox000html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox001expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox001html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox002expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox002html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox003expectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox003html">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166382 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-27 23:37:37 UTC (rev 166382)
+++ trunk/LayoutTests/ChangeLog 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2014-03-27 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes][css clip-path] rounded corner calculation for box shapes is wrong
+ https://bugs.webkit.org/show_bug.cgi?id=127982
+
+ Reviewed by Simon Fraser.
+
+ * css3/masking/clip-path-border-radius-border-box-000-expected.html: Added.
+ * css3/masking/clip-path-border-radius-border-box-000.html: Added.
+ * css3/masking/clip-path-border-radius-content-box-000-expected.html: Added.
+ * css3/masking/clip-path-border-radius-content-box-000.html: Added.
+ * css3/masking/clip-path-border-radius-content-box-001-expected.html: Added.
+ * css3/masking/clip-path-border-radius-content-box-001.html: Added.
+ * css3/masking/clip-path-border-radius-padding-box-000-expected.html: Added.
+ * css3/masking/clip-path-border-radius-padding-box-000.html: Added.
+ * css3/masking/clip-path-border-radius-padding-box-001-expected.html: Added.
+ * css3/masking/clip-path-border-radius-padding-box-001.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003.html: Added.
+
</ins><span class="cx"> 2014-03-27 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix a crash caused by track insertion after load()
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathborderradiusborderbox000expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/clip-path-border-radius-border-box-000-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-border-radius-border-box-000-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/clip-path-border-radius-border-box-000-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .clip {
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 30px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-clip-path: inset(0px round 30px);
+ }
+</style>
+<body>
+ <div class="clip"></div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathborderradiusborderbox000html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/clip-path-border-radius-border-box-000.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-border-radius-border-box-000.html (rev 0)
+++ trunk/LayoutTests/css3/masking/clip-path-border-radius-border-box-000.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .clip {
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 30px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-clip-path: border-box;
+ }
+</style>
+<body>
+ <div class="clip"></div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathborderradiuscontentbox000expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-000-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-000-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-000-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .clip {
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 30px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-clip-path: inset(40px);
+ }
+</style>
+<body>
+ <div class="clip"></div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathborderradiuscontentbox000html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-000.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-000.html (rev 0)
+++ trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-000.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .clip {
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 30px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-clip-path: content-box;
+ }
+</style>
+<body>
+ <div class="clip"></div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathborderradiuscontentbox001expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-001-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-001-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-001-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .clip {
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 70px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-clip-path: inset(40px round 30px);
+ }
+</style>
+<body>
+ <div class="clip"></div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathborderradiuscontentbox001html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-001.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-001.html (rev 0)
+++ trunk/LayoutTests/css3/masking/clip-path-border-radius-content-box-001.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .clip {
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 70px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-clip-path: content-box;
+ }
+</style>
+<body>
+ <div class="clip"></div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathborderradiuspaddingbox000expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-000-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-000-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-000-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .clip {
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 20px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-clip-path: inset(20px);
+ }
+</style>
+<body>
+ <div class="clip"></div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathborderradiuspaddingbox000html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-000.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-000.html (rev 0)
+++ trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-000.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .clip {
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 20px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-clip-path: padding-box;
+ }
+</style>
+<body>
+ <div class="clip"></div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathborderradiuspaddingbox001expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-001-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-001-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-001-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .clip {
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 50px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-clip-path: inset(20px round 30px);
+ }
+</style>
+<body>
+ <div class="clip"></div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathborderradiuspaddingbox001html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-001.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-001.html (rev 0)
+++ trunk/LayoutTests/css3/masking/clip-path-border-radius-padding-box-001.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .clip {
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 50px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-clip-path: padding-box;
+ }
+</style>
+<body>
+ <div class="clip"></div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusborderbox000expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 30px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: border-box;
+ -webkit-shape-outside: inset(20px round 30px);
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusborderbox000html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 30px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: border-box;
+ -webkit-shape-outside: border-box;
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusborderbox001expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 30px 20px 40px 10px / 10px 40px 20px 30px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: border-box;
+ -webkit-shape-outside: inset(20px round 30px 20px 40px 10px / 10px 40px 20px 30px);
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusborderbox001html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 30px 20px 40px 10px / 10px 40px 20px 30px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: border-box;
+ -webkit-shape-outside: border-box;
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusborderbox002expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ -webkit-writing-mode: vertical-lr;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 200px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 30px 20px 40px 10px / 10px 40px 20px 30px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: border-box;
+ -webkit-shape-outside: inset(20px round 30px 20px 40px 10px / 10px 40px 20px 30px);
+ }
+</style>
+<body>
+ <p>The black squares should follow the bottom side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusborderbox002html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ -webkit-writing-mode: vertical-lr;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 200px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 30px 20px 40px 10px / 10px 40px 20px 30px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: border-box;
+ -webkit-shape-outside: border-box;
+ }
+</style>
+<body>
+ <p>The black squares should follow the bottom side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox000expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 30px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: content-box;
+ -webkit-shape-outside: inset(60px);
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox000html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 30px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: content-box;
+ -webkit-shape-outside: content-box;
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox001expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 70px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: content-box;
+ -webkit-shape-outside: inset(60px round 30px);
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox001html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 70px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: content-box;
+ -webkit-shape-outside: content-box;
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox002expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 70px 60px 80px 50px / 50px 80px 60px 70px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: content-box;
+ -webkit-shape-outside: inset(60px round 30px 20px 40px 10px / 10px 40px 20px 30px);
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox002html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 70px 60px 80px 50px / 50px 80px 60px 70px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: content-box;
+ -webkit-shape-outside: content-box;
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox003expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ -webkit-writing-mode: vertical-lr;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 200px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 70px 60px 80px 50px / 50px 80px 60px 70px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: content-box;
+ -webkit-shape-outside: inset(60px round 30px 20px 40px 10px / 10px 40px 20px 30px);
+ }
+</style>
+<body>
+ <p>The black squares should follow the bottom side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuscontentbox003html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ -webkit-writing-mode: vertical-lr;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 200px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 70px 60px 80px 50px / 50px 80px 60px 70px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: content-box;
+ -webkit-shape-outside: content-box;
+ }
+</style>
+<body>
+ <p>The black squares should follow the bottom side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox000expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 10px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-shape-outside: inset(0px round 27.5px);
+ }
+</style>
+<body>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox000html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 10px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-shape-outside: margin-box;
+ }
+</style>
+<body>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox001expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 40px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-shape-outside: inset(0px round 60px);
+ }
+</style>
+<body>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox001html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 40px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-shape-outside: margin-box;
+ }
+</style>
+<body>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox002expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 40px;
+ margin: 0px;
+ background-color: blue;
+ -webkit-shape-outside: inset(0px round 40px);
+ }
+</style>
+<body>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox002html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 40px;
+ margin: 0px;
+ background-color: blue;
+ -webkit-shape-outside: margin-box;
+ }
+</style>
+<body>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox003expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 40px 20px 50px 30px / 30px 50px 20px 40px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-shape-outside: inset(0px round 60px 40px 70px 50px / 50px 70px 40px 60px);
+ }
+</style>
+<body>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox003html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 40px 20px 50px 30px / 30px 50px 20px 40px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-shape-outside: margin-box;
+ }
+</style>
+<body>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox004expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ -webkit-writing-mode: vertical-lr;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 200px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 40px 20px 50px 30px / 30px 50px 20px 40px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-shape-outside: inset(0px round 60px 40px 70px 50px / 50px 70px 40px 60px);
+ }
+</style>
+<body>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiusmarginbox004html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ -webkit-writing-mode: vertical-lr;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 200px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 40px 20px 50px 30px / 30px 50px 20px 40px;
+ margin: 20px;
+ background-color: blue;
+ -webkit-shape-outside: margin-box;
+ }
+</style>
+<body>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox000expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 20px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: padding-box;
+ -webkit-shape-outside: inset(40px);
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox000html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 20px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: padding-box;
+ -webkit-shape-outside: padding-box;
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox001expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 50px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: padding-box;
+ -webkit-shape-outside: inset(40px round 30px);
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox001html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 50px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: padding-box;
+ -webkit-shape-outside: padding-box;
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox002expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 50px 70px 60px 40px / 40px 60px 70px 50px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: padding-box;
+ -webkit-shape-outside: inset(40px round 30px 50px 40px 20px / 20px 40px 50px 20px);
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox002html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 50px 70px 60px 40px / 40px 60px 70px 50px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: padding-box;
+ -webkit-shape-outside: padding-box;
+ }
+</style>
+<body>
+ <p>The black squares should follow the right side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox003expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003-expected.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003-expected.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ -webkit-writing-mode: vertical-lr;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 200px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 50px 70px 60px 40px / 40px 60px 70px 50px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: padding-box;
+ -webkit-shape-outside: inset(40px round 30px 50px 40px 20px / 20px 40px 50px 20px);
+ }
+</style>
+<body>
+ <p>The black squares should follow the bottom side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsborderradiuspaddingbox003html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003.html (0 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003.html 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 300px;
+ font: 10px/1 Ahem;
+ -webkit-writing-mode: vertical-lr;
+ }
+ .float {
+ float: left;
+ width: 100px;
+ height: 200px;
+ padding: 20px;
+ border: 20px solid rgba(0, 0, 0, 0);
+ border-radius: 50px 70px 60px 40px / 40px 60px 70px 50px;
+ margin: 20px;
+ background-color: blue;
+ background-clip: padding-box;
+ -webkit-shape-outside: padding-box;
+ }
+</style>
+<body>
+ <p>The black squares should follow the bottom side of the blue shape. They should not overlap the shape.</p>
+ <div class="container">
+ <div class="float"></div>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ X<br>
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166382 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-27 23:37:37 UTC (rev 166382)
+++ trunk/Source/WebCore/ChangeLog 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -1,3 +1,62 @@
</span><ins>+2014-03-27 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes][css clip-path] rounded corner calculation for box shapes is wrong
+ https://bugs.webkit.org/show_bug.cgi?id=127982
+
+ Reviewed by Simon Fraser.
+
+ Calculate rounded corners for box shapes as defined in the CSS Shapes
+ spec.
+
+ Tests: css3/masking/clip-path-border-radius-border-box-000.html
+ css3/masking/clip-path-border-radius-content-box-000.html
+ css3/masking/clip-path-border-radius-content-box-001.html
+ css3/masking/clip-path-border-radius-padding-box-000.html
+ css3/masking/clip-path-border-radius-padding-box-001.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-000.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-001.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-border-box-002.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-000.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-001.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-002.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-content-box-003.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-000.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-001.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-002.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-003.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-margin-box-004.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-000.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-001.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-002.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-border-radius-padding-box-003.html
+
+ * platform/graphics/RoundedRect.h:
+ (WebCore::RoundedRect::Radii::transposedRadii): Transpose radii for
+ vertical writing modes.
+ (WebCore::RoundedRect::moveBy): Add method for use with clip path.
+ (WebCore::RoundedRect::transposedRect): Transpose rect for vertical
+ writing modes.
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::marginBoxRect): Return the margin box rect for
+ the RenderBox.
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::setupClipPath): Call the new function for the
+ rounded corner calculation.
+ * rendering/shapes/ShapeInfo.cpp:
+ (WebCore::ShapeInfo<RenderType>::computedShape): Call the new function
+ for the rounded corner calculation.
+ * rendering/shapes/BoxShape.cpp:
+ (WebCore::adjustRadiusForMarginBoxShape): Helper function for
+ computeRoundedRectForLayoutBoxShape.
+ (WebCore::computeMarginBoxShapeRadius): Ditto.
+ (WebCore::computeMarginBoxShapeRadii): Ditto.
+ (WebCore::computeRoundedRectForBoxShape): Utility function to do the
+ rounded corner calculation.
+ * rendering/shapes/BoxShape.h: Add new function.
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::getRoundedInnerBorderFor): Add default argument
+ values.
+
</ins><span class="cx"> 2014-03-27 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r166364.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsRoundedRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/RoundedRect.h (166382 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/RoundedRect.h 2014-03-27 23:37:37 UTC (rev 166382)
+++ trunk/Source/WebCore/platform/graphics/RoundedRect.h 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -69,6 +69,8 @@
</span><span class="cx"> void shrink(const LayoutUnit& topWidth, const LayoutUnit& bottomWidth, const LayoutUnit& leftWidth, const LayoutUnit& rightWidth) { expand(-topWidth, -bottomWidth, -leftWidth, -rightWidth); }
</span><span class="cx"> void shrink(const LayoutUnit& size) { shrink(size, size, size, size); }
</span><span class="cx">
</span><ins>+ Radii transposedRadii() const { return Radii(m_topLeft.transposedSize(), m_topRight.transposedSize(), m_bottomLeft.transposedSize(), m_bottomRight.transposedSize()); }
+
</ins><span class="cx"> private:
</span><span class="cx"> LayoutSize m_topLeft;
</span><span class="cx"> LayoutSize m_topRight;
</span><span class="lines">@@ -89,6 +91,7 @@
</span><span class="cx"> void setRadii(const Radii& radii) { m_radii = radii; }
</span><span class="cx">
</span><span class="cx"> void move(const LayoutSize& size) { m_rect.move(size); }
</span><ins>+ void moveBy(const LayoutPoint& offset) { m_rect.moveBy(offset); }
</ins><span class="cx"> void inflate(const LayoutUnit& size) { m_rect.inflate(size); }
</span><span class="cx"> void inflateWithRadii(const LayoutUnit& size);
</span><span class="cx"> void expandRadii(const LayoutUnit& size) { m_radii.expand(size); }
</span><span class="lines">@@ -106,6 +109,8 @@
</span><span class="cx">
</span><span class="cx"> FloatRoundedRect pixelSnappedRoundedRectForPainting(float deviceScaleFactor) const;
</span><span class="cx">
</span><ins>+ RoundedRect transposedRect() const { return RoundedRect(m_rect.transposedRect(), m_radii.transposedRadii()); }
+
</ins><span class="cx"> private:
</span><span class="cx"> LayoutRect m_rect;
</span><span class="cx"> Radii m_radii;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (166382 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2014-03-27 23:37:37 UTC (rev 166382)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -152,6 +152,12 @@
</span><span class="cx"> IntRect pixelSnappedFrameRect() const { return pixelSnappedIntRect(m_frameRect); }
</span><span class="cx"> void setFrameRect(const LayoutRect& rect) { m_frameRect = rect; }
</span><span class="cx">
</span><ins>+ LayoutRect marginBoxRect() const
+ {
+ LayoutRect box = borderBoxRect();
+ box.expand(m_marginBox);
+ return box;
+ }
</ins><span class="cx"> LayoutRect borderBoxRect() const { return LayoutRect(LayoutPoint(), size()); }
</span><span class="cx"> LayoutRect paddingBoxRect() const { return LayoutRect(borderLeft(), borderTop(), contentWidth() + paddingLeft() + paddingRight(), contentHeight() + paddingTop() + paddingBottom()); }
</span><span class="cx"> IntRect pixelSnappedBorderBoxRect() const { return IntRect(IntPoint(), m_frameRect.pixelSnappedSize()); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (166382 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-03-27 23:37:37 UTC (rev 166382)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #include "RenderLayer.h"
</span><span class="cx">
</span><span class="cx"> #include "AnimationController.h"
</span><ins>+#include "BoxShape.h"
</ins><span class="cx"> #include "ColumnInfo.h"
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="cx"> #include "Chrome.h"
</span><span class="lines">@@ -3903,10 +3904,8 @@
</span><span class="cx"> if (style.clipPath()->type() == ClipPathOperation::Box) {
</span><span class="cx"> BoxClipPathOperation& clippingPath = toBoxClipPathOperation(*(style.clipPath()));
</span><span class="cx">
</span><del>- LayoutRect referenceBox = computeReferenceBox(renderer(), clippingPath, offsetFromRoot, rootRelativeBounds);
- // FIXME This does not properly compute the rounded corners as specified in all conditions.
- // https://bugs.webkit.org/show_bug.cgi?id=127982
- const RoundedRect& shapeRect = renderer().style().getRoundedBorderFor(referenceBox, &(renderer().view()));
</del><ins>+ RoundedRect shapeRect = computeRoundedRectForBoxShape(clippingPath.referenceBox(), toRenderBox(renderer()));
+ shapeRect.moveBy(offsetFromRoot);
</ins><span class="cx">
</span><span class="cx"> context->save();
</span><span class="cx"> context->clipPath(clippingPath.pathForReferenceRect(shapeRect), RULE_NONZERO);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesBoxShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/BoxShape.cpp (166382 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/BoxShape.cpp 2014-03-27 23:37:37 UTC (rev 166382)
+++ trunk/Source/WebCore/rendering/shapes/BoxShape.cpp 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -30,10 +30,70 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "BoxShape.h"
</span><span class="cx">
</span><ins>+#include "RenderBox.h"
</ins><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static inline LayoutUnit adjustRadiusForMarginBoxShape(LayoutUnit radius, LayoutUnit margin)
+{
+ // This algorithm is defined in the CSS Shapes specifcation
+ if (!margin)
+ return radius;
+
+ LayoutUnit ratio = radius / margin;
+ if (ratio < 1)
+ return radius + (margin * (1 + pow(ratio - 1, 3)));
+
+ return radius + margin;
+}
+
+static inline LayoutSize computeMarginBoxShapeRadius(const LayoutSize& radius, const LayoutSize& adjacentMargins)
+{
+ return LayoutSize(adjustRadiusForMarginBoxShape(radius.width(), adjacentMargins.width()),
+ adjustRadiusForMarginBoxShape(radius.height(), adjacentMargins.height()));
+}
+
+static inline RoundedRect::Radii computeMarginBoxShapeRadii(const RoundedRect::Radii& radii, const RenderBox& renderer)
+{
+ return RoundedRect::Radii(computeMarginBoxShapeRadius(radii.topLeft(), LayoutSize(renderer.marginLeft(), renderer.marginTop())),
+ computeMarginBoxShapeRadius(radii.topRight(), LayoutSize(renderer.marginRight(), renderer.marginTop())),
+ computeMarginBoxShapeRadius(radii.bottomLeft(), LayoutSize(renderer.marginLeft(), renderer.marginBottom())),
+ computeMarginBoxShapeRadius(radii.bottomRight(), LayoutSize(renderer.marginRight(), renderer.marginBottom())));
+}
+
+RoundedRect computeRoundedRectForBoxShape(CSSBoxType box, const RenderBox& renderer)
+{
+ const RenderStyle& style = renderer.style();
+ switch (box) {
+ case MarginBox: {
+ if (!style.hasBorderRadius())
+ return RoundedRect(renderer.marginBoxRect(), RoundedRect::Radii());
+
+ LayoutRect marginBox = renderer.marginBoxRect();
+ RoundedRect::Radii radii = computeMarginBoxShapeRadii(style.getRoundedBorderFor(renderer.borderBoxRect(), &(renderer.view())).radii(), renderer);
+ radii.scale(calcBorderRadiiConstraintScaleFor(marginBox, radii));
+ return RoundedRect(marginBox, radii);
+ }
+ case PaddingBox:
+ return style.getRoundedInnerBorderFor(renderer.borderBoxRect());
+ case ContentBox:
+ return style.getRoundedInnerBorderFor(renderer.borderBoxRect(),
+ renderer.paddingTop() + renderer.borderTop(), renderer.paddingBottom() + renderer.borderBottom(),
+ renderer.paddingLeft() + renderer.borderLeft(), renderer.paddingRight() + renderer.borderRight());
+ // fill, stroke, view-box compute to border-box for HTML elements.
+ case BorderBox:
+ case Fill:
+ case Stroke:
+ case ViewBox:
+ case BoxMissing:
+ return style.getRoundedBorderFor(renderer.borderBoxRect(), &(renderer.view()));
+ }
+
+ ASSERT_NOT_REACHED();
+ return style.getRoundedBorderFor(renderer.borderBoxRect(), &(renderer.view()));
+}
+
</ins><span class="cx"> LayoutRect BoxShape::shapeMarginLogicalBoundingBox() const
</span><span class="cx"> {
</span><span class="cx"> FloatRect marginBounds(m_bounds.rect());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesBoxShapeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/BoxShape.h (166382 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/BoxShape.h 2014-03-27 23:37:37 UTC (rev 166382)
+++ trunk/Source/WebCore/rendering/shapes/BoxShape.h 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+RoundedRect computeRoundedRectForBoxShape(CSSBoxType, const RenderBox&);
+
</ins><span class="cx"> class BoxShape : public Shape {
</span><span class="cx"> public:
</span><span class="cx"> BoxShape(const FloatRoundedRect& bounds)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp (166382 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2014-03-27 23:37:37 UTC (rev 166382)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx">
</span><ins>+#include "BoxShape.h"
</ins><span class="cx"> #include "LengthFunctions.h"
</span><span class="cx"> #include "RenderBlock.h"
</span><span class="cx"> #include "RenderBox.h"
</span><span class="lines">@@ -141,9 +142,9 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case ShapeValue::Box: {
</span><del>- // FIXME This does not properly compute the rounded corners as specified in all conditions.
- // https://bugs.webkit.org/show_bug.cgi?id=127982
- const RoundedRect& shapeRect = m_renderer.style().getRoundedBorderFor(LayoutRect(LayoutPoint(), m_referenceBoxLogicalSize), &(m_renderer.view()));
</del><ins>+ RoundedRect shapeRect = computeRoundedRectForBoxShape(referenceBox(), m_renderer);
+ if (!this->styleForWritingMode().isHorizontalWritingMode())
+ shapeRect = shapeRect.transposedRect();
</ins><span class="cx"> m_shape = Shape::createBoxShape(shapeRect, writingMode, margin);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (166382 => 166383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-03-27 23:37:37 UTC (rev 166382)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-03-27 23:40:04 UTC (rev 166383)
</span><span class="lines">@@ -1095,7 +1095,7 @@
</span><span class="cx"> RoundedRect getRoundedInnerBorderFor(const LayoutRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
</span><span class="cx">
</span><span class="cx"> RoundedRect getRoundedInnerBorderFor(const LayoutRect& borderRect, LayoutUnit topWidth, LayoutUnit bottomWidth,
</span><del>- LayoutUnit leftWidth, LayoutUnit rightWidth, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
</del><ins>+ LayoutUnit leftWidth, LayoutUnit rightWidth, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
</ins><span class="cx">
</span><span class="cx"> void setBorderLeftWidth(float v) { SET_VAR(surround, border.m_left.m_width, v); }
</span><span class="cx"> void setBorderLeftStyle(EBorderStyle v) { SET_VAR(surround, border.m_left.m_style, v); }
</span></span></pre>
</div>
</div>
</body>
</html>