<!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>[182560] 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/182560">182560</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2015-04-08 12:40:43 -0700 (Wed, 08 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Properly handle negative reference box widths and center coordinates
https://bugs.webkit.org/show_bug.cgi?id=142610
Reviewed by Rob Buis.
Source/WebCore:
Fix a few cases where values that should not be negative end up that
way.
This patch is based on a couple of Blink patches by Rob Buis.
Tests: fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash.html
fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash.html
* rendering/shapes/ShapeOutsideInfo.cpp:
(WebCore::ShapeOutsideInfo::computeDeltasForContainingBlockLine): A
negative margin box width means that the shape has no extent, so
clamp to zero.
* rendering/style/BasicShapes.cpp:
(WebCore::BasicShapeCircle::floatValueForRadiusInBox): When computing
the radii, take the absolute value, since the radii is based on
the distance, which is always positive.
(WebCore::BasicShapeEllipse::floatValueForRadiusInBox): Ditto.
LayoutTests:
Tests for the cases that trigger asserts.
* fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash-expected.txt: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash-expected.txt: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash.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="#trunkSourceWebCorerenderingshapesShapeOutsideInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleBasicShapescpp">trunk/Source/WebCore/rendering/style/BasicShapes.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatscirclenegativeradiuscrashexpectedtxt">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatscirclenegativeradiuscrashhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsellipsenegativewidthcrashexpectedtxt">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsellipsenegativewidthcrashhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182559 => 182560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-08 19:28:34 UTC (rev 182559)
+++ trunk/LayoutTests/ChangeLog 2015-04-08 19:40:43 UTC (rev 182560)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-04-08 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] Properly handle negative reference box widths and center coordinates
+ https://bugs.webkit.org/show_bug.cgi?id=142610
+
+ Reviewed by Rob Buis.
+
+ Tests for the cases that trigger asserts.
+
+ * fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash-expected.txt: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash-expected.txt: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash.html: Added.
+
</ins><span class="cx"> 2015-04-08 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> Fill list style background with same color with that of list background.
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatscirclenegativeradiuscrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash-expected.txt (0 => 182560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash-expected.txt 2015-04-08 19:40:43 UTC (rev 182560)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+a This test passes if it doesn't crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatscirclenegativeradiuscrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash.html (0 => 182560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash.html 2015-04-08 19:40:43 UTC (rev 182560)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<style>
+div {
+ -webkit-shape-outside: padding-box circle(closest-side at 75px 80px);
+ float: right;
+}
+</style>
+<div>a</div>
+This test passes if it doesn't crash.
+<script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ }
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsellipsenegativewidthcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash-expected.txt (0 => 182560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash-expected.txt 2015-04-08 19:40:43 UTC (rev 182560)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+a This test passes if it doesn't crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsellipsenegativewidthcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash.html (0 => 182560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash.html 2015-04-08 19:40:43 UTC (rev 182560)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<style>
+div {
+ float: right;
+ -webkit-shape-outside: ellipse(2257% 6317vmax);
+ margin-right:-3553%;
+}
+</style>
+<div>a</div>
+This test passes if it doesn't crash.
+<script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ }
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182559 => 182560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-08 19:28:34 UTC (rev 182559)
+++ trunk/Source/WebCore/ChangeLog 2015-04-08 19:40:43 UTC (rev 182560)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-04-08 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] Properly handle negative reference box widths and center coordinates
+ https://bugs.webkit.org/show_bug.cgi?id=142610
+
+ Reviewed by Rob Buis.
+
+ Fix a few cases where values that should not be negative end up that
+ way.
+
+ This patch is based on a couple of Blink patches by Rob Buis.
+
+ Tests: fast/shapes/shape-outside-floats/shape-outside-floats-circle-negative-radius-crash.html
+ fast/shapes/shape-outside-floats/shape-outside-floats-ellipse-negative-width-crash.html
+
+ * rendering/shapes/ShapeOutsideInfo.cpp:
+ (WebCore::ShapeOutsideInfo::computeDeltasForContainingBlockLine): A
+ negative margin box width means that the shape has no extent, so
+ clamp to zero.
+ * rendering/style/BasicShapes.cpp:
+ (WebCore::BasicShapeCircle::floatValueForRadiusInBox): When computing
+ the radii, take the absolute value, since the radii is based on
+ the distance, which is always positive.
+ (WebCore::BasicShapeEllipse::floatValueForRadiusInBox): Ditto.
+
</ins><span class="cx"> 2015-04-08 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r182522.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp (182559 => 182560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2015-04-08 19:28:34 UTC (rev 182559)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2015-04-08 19:40:43 UTC (rev 182560)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx">
</span><span class="cx"> if (isShapeDirty() || !m_shapeOutsideDeltas.isForLine(borderBoxLineTop, lineHeight)) {
</span><span class="cx"> LayoutUnit referenceBoxLineTop = borderBoxLineTop - logicalTopOffset();
</span><del>- LayoutUnit floatMarginBoxWidth = containingBlock.logicalWidthForFloat(&floatingObject);
</del><ins>+ LayoutUnit floatMarginBoxWidth = std::max<LayoutUnit>(LayoutUnit(), containingBlock.logicalWidthForFloat(&floatingObject));
</ins><span class="cx">
</span><span class="cx"> if (computedShape().lineOverlapsShapeMarginBounds(referenceBoxLineTop, lineHeight)) {
</span><span class="cx"> LineSegment segment = computedShape().getExcludedInterval((borderBoxLineTop - logicalTopOffset()), std::min(lineHeight, shapeLogicalBottom() - borderBoxLineTop));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/BasicShapes.cpp (182559 => 182560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2015-04-08 19:28:34 UTC (rev 182559)
+++ trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2015-04-08 19:40:43 UTC (rev 182560)
</span><span class="lines">@@ -96,11 +96,13 @@
</span><span class="cx"> float centerX = floatValueForCenterCoordinate(m_centerX, boxWidth);
</span><span class="cx"> float centerY = floatValueForCenterCoordinate(m_centerY, boxHeight);
</span><span class="cx">
</span><ins>+ float widthDelta = std::abs(boxWidth - centerX);
+ float heightDelta = std::abs(boxHeight - centerY);
</ins><span class="cx"> if (m_radius.type() == BasicShapeRadius::ClosestSide)
</span><del>- return std::min(std::min(centerX, boxWidth - centerX), std::min(centerY, boxHeight - centerY));
</del><ins>+ return std::min(std::min(std::abs(centerX), widthDelta), std::min(std::abs(centerY), heightDelta));
</ins><span class="cx">
</span><span class="cx"> // If radius.type() == BasicShapeRadius::FarthestSide.
</span><del>- return std::max(std::max(centerX, boxWidth - centerX), std::max(centerY, boxHeight - centerY));
</del><ins>+ return std::max(std::max(std::abs(centerX), widthDelta), std::max(std::abs(centerY), heightDelta));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BasicShapeCircle::path(Path& path, const FloatRect& boundingBox)
</span><span class="lines">@@ -133,13 +135,14 @@
</span><span class="cx"> float BasicShapeEllipse::floatValueForRadiusInBox(const BasicShapeRadius& radius, float center, float boxWidthOrHeight) const
</span><span class="cx"> {
</span><span class="cx"> if (radius.type() == BasicShapeRadius::Value)
</span><del>- return floatValueForLength(radius.value(), boxWidthOrHeight);
</del><ins>+ return floatValueForLength(radius.value(), std::abs(boxWidthOrHeight));
</ins><span class="cx">
</span><ins>+ float widthOrHeightDelta = std::abs(boxWidthOrHeight - center);
</ins><span class="cx"> if (radius.type() == BasicShapeRadius::ClosestSide)
</span><del>- return std::min(center, boxWidthOrHeight - center);
</del><ins>+ return std::min(std::abs(center), widthOrHeightDelta);
</ins><span class="cx">
</span><span class="cx"> ASSERT(radius.type() == BasicShapeRadius::FarthestSide);
</span><del>- return std::max(center, boxWidthOrHeight - center);
</del><ins>+ return std::max(std::abs(center), widthOrHeightDelta);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BasicShapeEllipse::path(Path& path, const FloatRect& boundingBox)
</span></span></pre>
</div>
</div>
</body>
</html>