<!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>[172010] 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/172010">172010</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-08-04 15:17:19 -0700 (Mon, 04 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] shape-margin not respected when it extends beyond an explicitly set margin
https://bugs.webkit.org/show_bug.cgi?id=135308
Reviewed by Dean Jackson.
Source/WebCore:
When a zero height line is supplied and the image shape extends into
the margin box (only possible when a shape-margin is supplied), then
only an empty interval was being returned. This patch makes it
properly return the interval for the line in question.
Test: fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html
* rendering/shapes/RasterShape.cpp:
(WebCore::RasterShape::getExcludedIntervals): Handle the zero height
line case.
LayoutTests:
Test case based on the one supplied by Rebecca Hauck in the bug
report.
* fast/shapes/resources/square.png: Added.
* fast/shapes/shape-outside-floats/shape-outside-image-shape-margin-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.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="#trunkSourceWebCorerenderingshapesRasterShapecpp">trunk/Source/WebCore/rendering/shapes/RasterShape.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshapesresourcessquarepng">trunk/LayoutTests/fast/shapes/resources/square.png</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideimageshapemarginexpectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideimageshapemarginhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172009 => 172010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-04 22:04:39 UTC (rev 172009)
+++ trunk/LayoutTests/ChangeLog 2014-08-04 22:17:19 UTC (rev 172010)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-08-04 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] shape-margin not respected when it extends beyond an explicitly set margin
+ https://bugs.webkit.org/show_bug.cgi?id=135308
+
+ Reviewed by Dean Jackson.
+
+ Test case based on the one supplied by Rebecca Hauck in the bug
+ report.
+
+ * fast/shapes/resources/square.png: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-image-shape-margin-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html: Added.
+
</ins><span class="cx"> 2014-08-04 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: InlineTextBox mistakenly rounds offset value before painting.
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesresourcessquarepng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/fast/shapes/resources/square.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/fast/shapes/resources/square.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideimageshapemarginexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin-expected.html (0 => 172010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin-expected.html 2014-08-04 22:17:19 UTC (rev 172010)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>CSS Reference File</title>
+ <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/>
+ <style type="text/css">
+ #container {
+ position: absolute;
+ top: 170px;
+ }
+ #shape-ref-div {
+ width: 50px;
+ height: 100px;
+ background-color: rgb(0, 100, 0);
+ }
+ #line {
+ width: 100px;
+ height: 1px;
+ background-color: black;
+ }
+ </style>
+</head>
+<body>
+ <p>
+ The test passes if the green rectangle is below the line. There should be no red.
+ </p>
+ <div id="container">
+ <div id="line"><div>
+ <div id="shape-ref-div"></div>
+ </div>
+</body>
+</html>
+
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideimageshapemarginhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html (0 => 172010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html 2014-08-04 22:17:19 UTC (rev 172010)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>CSS Test: Image shape with margin-right + shape-margin on a left float</title>
+ <link rel="author" title="Rebecca Hauck" href="rhauck@adobe.com"/>
+ <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/>
+ <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
+ <link rel="help" href="http://www.w3.org/TR/css-shapes/#shape-margin-property"/>
+ <meta name="flags" content="ahem image"/>
+ <meta name="assert" content="This test verifies that the image shape that defines the float
+ area is clipped to the float's margin box and respects the
+ shape-margin extending beyond the margin-right, causing the
+ text to be pushed below the defined shape."/>
+ <style type="text/css">
+ .container {
+ position: relative;
+ font-family: Ahem;
+ font-size: 50px;
+ line-height: 50px;
+ }
+ #test {
+ width: 100px;
+ height: 100px;
+ color: rgb(0, 100, 0);
+ }
+ #shape-div {
+ float: left;
+ width: 50px;
+ height: 180px;
+ -webkit-shape-margin: 20px;
+ -webkit-shape-outside: url(../resources/square.png);
+ margin-right: 10px;
+ }
+ #ref {
+ position: absolute;
+ top: 170px;
+ }
+ #line {
+ width: 100px;
+ height: 1px;
+ background-color: black;
+ }
+ #failure {
+ width: 50px;
+ height: 99px;
+ background-color: red;
+ z-index: -1;
+ }
+ </style>
+</head>
+<body>
+ <p>
+ The test passes if the green rectangle is below the line. There should be no red.
+ </p>
+ <div id="ref">
+ <div id="line"></div>
+ <div id="failure"></div>
+ </div>
+ <div id="test" class="container">
+ <div id="shape-div"></div>
+ x x
+ </div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172009 => 172010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-04 22:04:39 UTC (rev 172009)
+++ trunk/Source/WebCore/ChangeLog 2014-08-04 22:17:19 UTC (rev 172010)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-08-04 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] shape-margin not respected when it extends beyond an explicitly set margin
+ https://bugs.webkit.org/show_bug.cgi?id=135308
+
+ Reviewed by Dean Jackson.
+
+ When a zero height line is supplied and the image shape extends into
+ the margin box (only possible when a shape-margin is supplied), then
+ only an empty interval was being returned. This patch makes it
+ properly return the interval for the line in question.
+
+ Test: fast/shapes/shape-outside-floats/shape-outside-image-shape-margin.html
+
+ * rendering/shapes/RasterShape.cpp:
+ (WebCore::RasterShape::getExcludedIntervals): Handle the zero height
+ line case.
+
</ins><span class="cx"> 2014-08-04 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: InlineTextBox mistakenly rounds offset value before painting.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesRasterShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/RasterShape.cpp (172009 => 172010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/RasterShape.cpp 2014-08-04 22:04:39 UTC (rev 172009)
+++ trunk/Source/WebCore/rendering/shapes/RasterShape.cpp 2014-08-04 22:17:19 UTC (rev 172010)
</span><span class="lines">@@ -165,8 +165,12 @@
</span><span class="cx"> y2 = std::min(y2, intervals.bounds().maxY());
</span><span class="cx"> IntShapeInterval excludedInterval;
</span><span class="cx">
</span><del>- for (int y = y1; y < y2; y++)
- excludedInterval.unite(intervals.intervalAt(y));
</del><ins>+ if (y1 == y2)
+ excludedInterval = intervals.intervalAt(y1);
+ else {
+ for (int y = y1; y < y2; y++)
+ excludedInterval.unite(intervals.intervalAt(y));
+ }
</ins><span class="cx">
</span><span class="cx"> result.append(LineSegment(excludedInterval.x1(), excludedInterval.x2()));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>