<!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>[178054] 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/178054">178054</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2015-01-07 14:30:32 -0800 (Wed, 07 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Negative raster shape height leads to crash
https://bugs.webkit.org/show_bug.cgi?id=136087
Reviewed by Zoltan Horvath.
Source/WebCore:
This patch clamps the size of the margin box rect used to compute the
raster shape on a float so the width and height cannot be negative.
This makes it safe to use that rect to determine the size of the shape
intervals data structure.
Test: fast/shapes/shape-outside-floats/shape-outside-negative-height-crash.html
* rendering/shapes/Shape.cpp:
(WebCore::Shape::createRasterShape): Add an assert to be explict about
the precondition.
* rendering/shapes/ShapeOutsideInfo.cpp:
(WebCore::getShapeImageMarginRect): Clamp the marginRect's size.
LayoutTests:
* fast/shapes/shape-outside-floats/shape-outside-negative-height-crash-expected.txt: Added.
* fast/shapes/shape-outside-floats/shape-outside-negative-height-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="#trunkSourceWebCorerenderingshapesShapecpp">trunk/Source/WebCore/rendering/shapes/Shape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeOutsideInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidenegativeheightcrashexpectedtxt">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-height-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidenegativeheightcrashhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-height-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178053 => 178054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-01-07 22:26:28 UTC (rev 178053)
+++ trunk/LayoutTests/ChangeLog        2015-01-07 22:30:32 UTC (rev 178054)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-01-07 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] Negative raster shape height leads to crash
+ https://bugs.webkit.org/show_bug.cgi?id=136087
+
+ Reviewed by Zoltan Horvath.
+
+ * fast/shapes/shape-outside-floats/shape-outside-negative-height-crash-expected.txt: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-negative-height-crash.html: Added.
+
</ins><span class="cx"> 2015-01-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add layout test for animated GIFs in iframes moved in and out of the viewport using -webkit-transform
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidenegativeheightcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-height-crash-expected.txt (0 => 178054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-height-crash-expected.txt         (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-height-crash-expected.txt        2015-01-07 22:30:32 UTC (rev 178054)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test passes if it doesn't crash.
+
+a aa a
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidenegativeheightcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-height-crash.html (0 => 178054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-height-crash.html         (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-height-crash.html        2015-01-07 22:30:32 UTC (rev 178054)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .container {
+ width: 10px;
+ }
+ .float {
+ float: left;
+ }
+ .crasher {
+ /* 1x1 px transparent png */
+ -webkit-shape-outside: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR4nGP6zwAAAgcBApocMXEAAAAASUVORK5CYII=);
+ margin-top: -19px;
+ }
+</style>
+<body>
+ <p>This test passes if it doesn't crash.</p>
+ <div class="container">
+ <div class="float">a a</div>
+ <div class="float crasher">a</div>
+ a
+ </div>
+</body>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178053 => 178054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-07 22:26:28 UTC (rev 178053)
+++ trunk/Source/WebCore/ChangeLog        2015-01-07 22:30:32 UTC (rev 178054)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-01-07 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] Negative raster shape height leads to crash
+ https://bugs.webkit.org/show_bug.cgi?id=136087
+
+ Reviewed by Zoltan Horvath.
+
+ This patch clamps the size of the margin box rect used to compute the
+ raster shape on a float so the width and height cannot be negative.
+ This makes it safe to use that rect to determine the size of the shape
+ intervals data structure.
+
+ Test: fast/shapes/shape-outside-floats/shape-outside-negative-height-crash.html
+
+ * rendering/shapes/Shape.cpp:
+ (WebCore::Shape::createRasterShape): Add an assert to be explict about
+ the precondition.
+ * rendering/shapes/ShapeOutsideInfo.cpp:
+ (WebCore::getShapeImageMarginRect): Clamp the marginRect's size.
+
</ins><span class="cx"> 2015-01-06 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Modernize the SVGElement and MathMLElement factories
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/Shape.cpp (178053 => 178054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/Shape.cpp        2015-01-07 22:26:28 UTC (rev 178053)
+++ trunk/Source/WebCore/rendering/shapes/Shape.cpp        2015-01-07 22:30:32 UTC (rev 178054)
</span><span class="lines">@@ -174,6 +174,8 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Shape> Shape::createRasterShape(Image* image, float threshold, const LayoutRect& imageR, const LayoutRect& marginR, WritingMode writingMode, float margin)
</span><span class="cx"> {
</span><ins>+ ASSERT(marginR.height() >= 0);
+
</ins><span class="cx"> IntRect imageRect = snappedIntRect(imageR);
</span><span class="cx"> IntRect marginRect = snappedIntRect(marginR);
</span><span class="cx"> auto intervals = std::make_unique<RasterShapeIntervals>(marginRect.height(), -marginRect.y());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp (178053 => 178054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp        2015-01-07 22:26:28 UTC (rev 178053)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp        2015-01-07 22:30:32 UTC (rev 178054)
</span><span class="lines">@@ -141,7 +141,9 @@
</span><span class="cx"> {
</span><span class="cx"> LayoutPoint marginBoxOrigin(-renderBox.marginLogicalLeft() - renderBox.borderAndPaddingLogicalLeft(), -renderBox.marginBefore() - renderBox.borderBefore() - renderBox.paddingBefore());
</span><span class="cx"> LayoutSize marginBoxSizeDelta(renderBox.marginLogicalWidth() + renderBox.borderAndPaddingLogicalWidth(), renderBox.marginLogicalHeight() + renderBox.borderAndPaddingLogicalHeight());
</span><del>- return LayoutRect(marginBoxOrigin, referenceBoxLogicalSize + marginBoxSizeDelta);
</del><ins>+ LayoutSize marginRectSize(referenceBoxLogicalSize + marginBoxSizeDelta);
+ marginRectSize.clampNegativeToZero();
+ return LayoutRect(marginBoxOrigin, marginRectSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Shape> ShapeOutsideInfo::createShapeForImage(StyleImage* styleImage, float shapeImageThreshold, WritingMode writingMode, float margin) const
</span></span></pre>
</div>
</div>
</body>
</html>