<!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>[169606] 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/169606">169606</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-06-04 21:52:57 -0700 (Wed, 04 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Image lifetime is not properly handled for gradient shapes
https://bugs.webkit.org/show_bug.cgi?id=133414
Reviewed by Simon Fraser.
Source/WebCore:
Refactor computedShape() and it's helpers to be able to properly
manage the lifetime of the image returned from StyleImage.
This is a port of a Blink patch by Hans Muller.
Test: fast/shapes/shape-outside-floats/shape-outside-uncached-gradient.html
* rendering/shapes/ShapeOutsideInfo.cpp:
(WebCore::ShapeOutsideInfo::createShapeForImage): Properly handle the
lifetime of the image. Changed to use StyleImage::image() to get
the image in all cases there's no need to special case cached
images.
(WebCore::ShapeOutsideInfo::computedShape): Call createShapeForImage.
(WebCore::getShapeImageAndRect): Deleted.
* rendering/shapes/ShapeOutsideInfo.h:
LayoutTests:
* fast/shapes/shape-outside-floats/shape-outside-uncached-gradient-expected.txt: Added.
* fast/shapes/shape-outside-floats/shape-outside-uncached-gradient.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="#trunkSourceWebCorerenderingshapesShapeOutsideInfoh">trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideuncachedgradientexpectedtxt">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-uncached-gradient-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideuncachedgradienthtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-uncached-gradient.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169605 => 169606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-05 01:05:45 UTC (rev 169605)
+++ trunk/LayoutTests/ChangeLog 2014-06-05 04:52:57 UTC (rev 169606)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-06-04 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><ins>+ [CSS Shapes] Image lifetime is not properly handled for gradient shapes
+ https://bugs.webkit.org/show_bug.cgi?id=133414
+
+ Reviewed by Simon Fraser.
+
+ * fast/shapes/shape-outside-floats/shape-outside-uncached-gradient-expected.txt: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-uncached-gradient.html: Added.
+
+2014-06-04 Bem Jones-Bey <bjonesbe@adobe.com>
+
</ins><span class="cx"> [CSS Shapes] Fix off by one in creating a RasterShape
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133499
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideuncachedgradientexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-uncached-gradient-expected.txt (0 => 169606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-uncached-gradient-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-uncached-gradient-expected.txt 2014-06-05 04:52:57 UTC (rev 169606)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+This test should not crash when run with a tool like ASAN.
+Hello World
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideuncachedgradienthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-uncached-gradient.html (0 => 169606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-uncached-gradient.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-uncached-gradient.html 2014-06-05 04:52:57 UTC (rev 169606)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<!--
+This is a regression test for https://bugs.webkit.org/show_bug.cgi?id=133414
+-->
+<head>
+<style>
+#image-shape {
+ float: left;
+ -webkit-shape-outside: linear-gradient(magenta, currentColor); // currentColor prevents gradient from being cached
+ width: 100px;
+ height: 100px;
+}
+</style>
+<div>This test should not crash when run with a tool like ASAN.</div>
+<div>
+ <div id="image-shape"></div>
+ Hello World
+</div>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169605 => 169606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-05 01:05:45 UTC (rev 169605)
+++ trunk/Source/WebCore/ChangeLog 2014-06-05 04:52:57 UTC (rev 169606)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-06-04 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><ins>+ [CSS Shapes] Image lifetime is not properly handled for gradient shapes
+ https://bugs.webkit.org/show_bug.cgi?id=133414
+
+ Reviewed by Simon Fraser.
+
+ Refactor computedShape() and it's helpers to be able to properly
+ manage the lifetime of the image returned from StyleImage.
+
+ This is a port of a Blink patch by Hans Muller.
+
+ Test: fast/shapes/shape-outside-floats/shape-outside-uncached-gradient.html
+
+ * rendering/shapes/ShapeOutsideInfo.cpp:
+ (WebCore::ShapeOutsideInfo::createShapeForImage): Properly handle the
+ lifetime of the image. Changed to use StyleImage::image() to get
+ the image in all cases there's no need to special case cached
+ images.
+ (WebCore::ShapeOutsideInfo::computedShape): Call createShapeForImage.
+ (WebCore::getShapeImageAndRect): Deleted.
+ * rendering/shapes/ShapeOutsideInfo.h:
+
+2014-06-04 Bem Jones-Bey <bjonesbe@adobe.com>
+
</ins><span class="cx"> [CSS Shapes] Fix off by one in creating a RasterShape
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133499
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp (169605 => 169606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2014-06-05 01:05:45 UTC (rev 169605)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2014-06-05 04:52:57 UTC (rev 169606)
</span><span class="lines">@@ -137,26 +137,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void getShapeImageAndRect(const ShapeValue& shapeValue, const RenderBox& renderBox, const LayoutSize& referenceBoxSize, Image*& image, LayoutRect& rect)
-{
- ASSERT(shapeValue.isImageValid());
- StyleImage* styleImage = shapeValue.image();
-
- const LayoutSize& imageSize = renderBox.calculateImageIntrinsicDimensions(styleImage, roundedIntSize(referenceBoxSize), RenderImage::ScaleByEffectiveZoom);
- styleImage->setContainerSizeForRenderer(&renderBox, imageSize, renderBox.style().effectiveZoom());
-
- image = nullptr;
- if (styleImage->isCachedImage() || styleImage->isCachedImageSet())
- image = styleImage->cachedImage()->imageForRenderer(&renderBox);
- else if (styleImage->isGeneratedImage())
- image = styleImage->image(const_cast<RenderBox*>(&renderBox), imageSize).get();
-
- if (renderBox.isRenderImage())
- rect = toRenderImage(&renderBox)->replacedContentRect(renderBox.intrinsicSize());
- else
- rect = LayoutRect(LayoutPoint(), imageSize);
-}
-
</del><span class="cx"> static LayoutRect getShapeImageMarginRect(const RenderBox& renderBox, const LayoutSize& referenceBoxLogicalSize)
</span><span class="cx"> {
</span><span class="cx"> LayoutPoint marginBoxOrigin(-renderBox.marginLogicalLeft() - renderBox.borderAndPaddingLogicalLeft(), -renderBox.marginBefore() - renderBox.borderBefore() - renderBox.paddingBefore());
</span><span class="lines">@@ -164,6 +144,22 @@
</span><span class="cx"> return LayoutRect(marginBoxOrigin, referenceBoxLogicalSize + marginBoxSizeDelta);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+std::unique_ptr<Shape> ShapeOutsideInfo::createShapeForImage(StyleImage* styleImage, float shapeImageThreshold, WritingMode writingMode, float margin) const
+{
+ const LayoutSize& imageSize = m_renderer.calculateImageIntrinsicDimensions(styleImage, roundedLayoutSize(m_referenceBoxLogicalSize), RenderImage::ScaleByEffectiveZoom);
+ styleImage->setContainerSizeForRenderer(&m_renderer, imageSize, m_renderer.style().effectiveZoom());
+
+ const LayoutRect& marginRect = getShapeImageMarginRect(m_renderer, m_referenceBoxLogicalSize);
+ const LayoutRect& imageRect = m_renderer.isRenderImage()
+ ? toRenderImage(&m_renderer)->replacedContentRect(m_renderer.intrinsicSize())
+ : LayoutRect(LayoutPoint(), imageSize);
+
+ ASSERT(!styleImage->isPendingImage());
+ RefPtr<Image> image = styleImage->image(const_cast<RenderBox*>(&m_renderer), imageSize);
+
+ return Shape::createRasterShape(image.get(), shapeImageThreshold, imageRect, marginRect, writingMode, margin);
+}
+
</ins><span class="cx"> const Shape& ShapeOutsideInfo::computedShape() const
</span><span class="cx"> {
</span><span class="cx"> if (Shape* shape = m_shape.get())
</span><span class="lines">@@ -183,14 +179,10 @@
</span><span class="cx"> ASSERT(shapeValue.shape());
</span><span class="cx"> m_shape = Shape::createShape(shapeValue.shape(), m_referenceBoxLogicalSize, writingMode, margin);
</span><span class="cx"> break;
</span><del>- case ShapeValue::Image: {
- Image* image;
- LayoutRect imageRect;
- getShapeImageAndRect(shapeValue, m_renderer, m_referenceBoxLogicalSize, image, imageRect);
- const LayoutRect& marginRect = getShapeImageMarginRect(m_renderer, m_referenceBoxLogicalSize);
- m_shape = Shape::createRasterShape(image, shapeImageThreshold, imageRect, marginRect, writingMode, margin);
</del><ins>+ case ShapeValue::Image:
+ ASSERT(shapeValue.isImageValid());
+ m_shape = createShapeForImage(shapeValue.image(), shapeImageThreshold, writingMode, margin);
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> case ShapeValue::Box: {
</span><span class="cx"> RoundedRect shapeRect = computeRoundedRectForBoxShape(referenceBox(shapeValue), m_renderer);
</span><span class="cx"> if (!containingBlockStyle.isHorizontalWritingMode())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h (169605 => 169606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2014-06-05 01:05:45 UTC (rev 169605)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2014-06-05 04:52:57 UTC (rev 169606)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> class RenderBlockFlow;
</span><span class="cx"> class RenderBox;
</span><ins>+class StyleImage;
</ins><span class="cx"> class FloatingObject;
</span><span class="cx">
</span><span class="cx"> class ShapeOutsideInfo final {
</span><span class="lines">@@ -93,6 +94,8 @@
</span><span class="cx"> static ShapeOutsideInfo* info(const RenderBox& key) { return infoMap().get(&key); }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ std::unique_ptr<Shape> createShapeForImage(StyleImage*, float shapeImageThreshold, WritingMode, float margin) const;
+
</ins><span class="cx"> SegmentList computeSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight) const;
</span><span class="cx">
</span><span class="cx"> LayoutUnit logicalTopOffset() const;
</span></span></pre>
</div>
</div>
</body>
</html>