<!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>[172973] 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/172973">172973</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-26 13:12:57 -0700 (Tue, 26 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Positioned polygon reftests failing
https://bugs.webkit.org/show_bug.cgi?id=135925
Reviewed by David Hyatt.
Source/WebCore:
We didn't respect the shape-margin before a positioned polygon, since we checked
the shape-margin for only 1 vertex for a polygon edge. This patch fixes the behavior,
removes the tests from the skipped list and updates 1 test, which was incorrect.
Updated existing test and removed tests from skipped list.
* rendering/shapes/PolygonShape.cpp:
(WebCore::clippedCircleXRange):
(WebCore::PolygonShape::getExcludedInterval):
LayoutTests:
* TestExpectations: Remove passing tests.
* css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html: Fix test behavior.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestscss3shapesshapeoutsidesupportedshapespolygonshapeoutsidepolygon012html">trunk/LayoutTests/css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesPolygonShapecpp">trunk/Source/WebCore/rendering/shapes/PolygonShape.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172972 => 172973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-26 20:11:59 UTC (rev 172972)
+++ trunk/LayoutTests/ChangeLog 2014-08-26 20:12:57 UTC (rev 172973)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-08-26 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Positioned polygon reftests failing
+ https://bugs.webkit.org/show_bug.cgi?id=135925
+
+ Reviewed by David Hyatt.
+
+ * TestExpectations: Remove passing tests.
+ * css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html: Fix test behavior.
+
</ins><span class="cx"> 2014-08-26 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r172940.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (172972 => 172973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2014-08-26 20:11:59 UTC (rev 172972)
+++ trunk/LayoutTests/TestExpectations 2014-08-26 20:12:57 UTC (rev 172973)
</span><span class="lines">@@ -149,11 +149,6 @@
</span><span class="cx"> webkit.org/b/135923 css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-003.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/135923 css3/shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-004.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><del>-webkit.org/b/135925 css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html [ ImageOnlyFailure ]
-webkit.org/b/135925 css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-013.html [ ImageOnlyFailure ]
-webkit.org/b/135925 css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html [ ImageOnlyFailure ]
-webkit.org/b/135925 css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html [ ImageOnlyFailure ]
-
</del><span class="cx"> webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-010.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-011.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/135927 css3/shapes/spec-examples/shape-outside-012.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestscss3shapesshapeoutsidesupportedshapespolygonshapeoutsidepolygon012html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html (172972 => 172973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html 2014-08-26 20:11:59 UTC (rev 172972)
+++ trunk/LayoutTests/css3/shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html 2014-08-26 20:12:57 UTC (rev 172973)
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx"> }
</span><span class="cx"> #ref-2 {
</span><span class="cx"> top: 150px;
</span><del>- left: 170px;
- width: 80px;
</del><ins>+ left: 150px;
+ width: 100px;
</ins><span class="cx"> height: 20px;
</span><span class="cx"> }
</span><span class="cx"> #ref-3 {
</span><span class="lines">@@ -66,10 +66,10 @@
</span><span class="cx"> <p>The test passes if there is green square and no red.</p>
</span><span class="cx"> <div id="container">
</span><span class="cx"> <div id="test-shape"></div>
</span><del>- XXXXXXXXXXXX XXX XXX XXX XXX XXXXXXXX XXXXXX XXXXXX XXXXXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXX
</del><ins>+ XXXXXXXXXXXX XXX XXX XXX XXX XXXXxXX XXXXXX XXXXXX XXXXXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXX
</ins><span class="cx"> </div>
</span><span class="cx"> <div id="ref-1" class="ref-shape"></div>
</span><span class="cx"> <div id="ref-2" class="ref-shape"></div>
</span><span class="cx"> <div id="ref-3" class="ref-shape"></div>
</span><span class="cx"> </body>
</span><del>-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172972 => 172973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-26 20:11:59 UTC (rev 172972)
+++ trunk/Source/WebCore/ChangeLog 2014-08-26 20:12:57 UTC (rev 172973)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-08-26 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Positioned polygon reftests failing
+ https://bugs.webkit.org/show_bug.cgi?id=135925
+
+ Reviewed by David Hyatt.
+
+ We didn't respect the shape-margin before a positioned polygon, since we checked
+ the shape-margin for only 1 vertex for a polygon edge. This patch fixes the behavior,
+ removes the tests from the skipped list and updates 1 test, which was incorrect.
+
+ Updated existing test and removed tests from skipped list.
+
+ * rendering/shapes/PolygonShape.cpp:
+ (WebCore::clippedCircleXRange):
+ (WebCore::PolygonShape::getExcludedInterval):
+
</ins><span class="cx"> 2014-08-26 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel layout: Remove float to LayoutUnit ceil/round function wrappers.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesPolygonShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/PolygonShape.cpp (172972 => 172973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/PolygonShape.cpp 2014-08-26 20:11:59 UTC (rev 172972)
+++ trunk/Source/WebCore/rendering/shapes/PolygonShape.cpp 2014-08-26 20:12:57 UTC (rev 172973)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> static FloatShapeInterval clippedCircleXRange(const FloatPoint& center, float radius, float y1, float y2)
</span><span class="cx"> {
</span><del>- if (y1 > center.y() + radius || y2 < center.y() - radius)
</del><ins>+ if (y1 >= center.y() + radius || y2 <= center.y() - radius)
</ins><span class="cx"> return FloatShapeInterval();
</span><span class="cx">
</span><span class="cx"> if (center.y() >= y1 && center.y() <= y2)
</span><span class="lines">@@ -140,6 +140,7 @@
</span><span class="cx"> excludedInterval.unite(OffsetPolygonEdge(edge, outwardEdgeNormal(edge) * shapeMargin()).clippedEdgeXRange(y1, y2));
</span><span class="cx"> excludedInterval.unite(OffsetPolygonEdge(edge, inwardEdgeNormal(edge) * shapeMargin()).clippedEdgeXRange(y1, y2));
</span><span class="cx"> excludedInterval.unite(clippedCircleXRange(edge.vertex1(), shapeMargin(), y1, y2));
</span><ins>+ excludedInterval.unite(clippedCircleXRange(edge.vertex2(), shapeMargin(), y1, y2));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>