<!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>[160429] 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/160429">160429</a></dd>
<dt>Author</dt> <dd>rwlbuis@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-11 05:38:59 -0800 (Wed, 11 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Take into account fill-rule for polygon interpolation
https://bugs.webkit.org/show_bug.cgi?id=125508
Reviewed by Dirk Schulze.
Source/WebCore:
Implement the polygon fill-rule part of http://dev.w3.org/csswg/css-shapes/#basic-shape-interpolation.
Adapt fast/shapes/shape-outside-floats/shape-outside-animation.html.
* rendering/style/BasicShapes.cpp:
(WebCore::BasicShape::canBlend):
LayoutTests:
Adapt fast/shapes/shape-outside-floats/shape-outside-animation.html so it also tests polygon animation
when using different fill rules.
* animations/resources/animation-test-helpers.js:
(parseBasicShape): also allow evenodd when parsing the polygon
* fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt:
* fast/shapes/shape-outside-floats/shape-outside-animation.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsanimationsresourcesanimationtesthelpersjs">trunk/LayoutTests/animations/resources/animation-test-helpers.js</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideanimationexpectedtxt">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideanimationhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleBasicShapescpp">trunk/Source/WebCore/rendering/style/BasicShapes.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160428 => 160429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-11 12:42:50 UTC (rev 160428)
+++ trunk/LayoutTests/ChangeLog 2013-12-11 13:38:59 UTC (rev 160429)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-11 Rob Buis <rob.buis@samsung.com>
+
+ [CSS Shapes] Take into account fill-rule for polygon interpolation
+ https://bugs.webkit.org/show_bug.cgi?id=125508
+
+ Reviewed by Dirk Schulze.
+
+ Adapt fast/shapes/shape-outside-floats/shape-outside-animation.html so it also tests polygon animation
+ when using different fill rules.
+
+ * animations/resources/animation-test-helpers.js:
+ (parseBasicShape): also allow evenodd when parsing the polygon
+ * fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt:
+ * fast/shapes/shape-outside-floats/shape-outside-animation.html:
+
</ins><span class="cx"> 2013-12-11 Michal Poteralski <m.poteralski@samsung.com>
</span><span class="cx">
</span><span class="cx"> Test results of postMessage-clone-port-error.html test are broken
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsresourcesanimationtesthelpersjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/resources/animation-test-helpers.js (160428 => 160429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/resources/animation-test-helpers.js 2013-12-11 12:42:50 UTC (rev 160428)
+++ trunk/LayoutTests/animations/resources/animation-test-helpers.js 2013-12-11 13:38:59 UTC (rev 160429)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> matches = s.match("ellipse\\((.*)\\s+(.*)\\s+at\\s+(.*)\\s+(.*)\\)");
</span><span class="cx"> break;
</span><span class="cx"> case "polygon":
</span><del>- matches = s.match("polygon\\(nonzero, (.*)\\s+(.*)\\s*,\\s*(.*)\\s+(.*)\\s*,\\s*(.*)\\s+(.*)\\s*,\\s*(.*)\\s+(.*)\\)");
</del><ins>+ matches = s.match("polygon\\((evenodd|nonzero), (.*)\\s+(.*)\\s*,\\s*(.*)\\s+(.*)\\s*,\\s*(.*)\\s+(.*)\\s*,\\s*(.*)\\s+(.*)\\)");
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> return null;
</span><span class="lines">@@ -232,9 +232,12 @@
</span><span class="cx"> return null;
</span><span class="cx">
</span><span class="cx"> matches.shift();
</span><ins>+ var i = 0;
+ if (shapeFunction[1] == "polygon")
+ i++; // skip nonzero|evenodd below
</ins><span class="cx">
</span><span class="cx"> // Normalize percentage values.
</span><del>- for (var i = 0; i < matches.length; ++i) {
</del><ins>+ for (; i < matches.length; ++i) {
</ins><span class="cx"> var param = matches[i];
</span><span class="cx"> matches[i] = parseFloat(matches[i]);
</span><span class="cx"> if (param.indexOf('%') != -1)
</span><span class="lines">@@ -309,7 +312,13 @@
</span><span class="cx"> if (paramList1.shape != paramList2.shape
</span><span class="cx"> || paramList1.params.length != paramList2.params.length)
</span><span class="cx"> return false;
</span><del>- for (var i = 0; i < paramList1.params.length; ++i) {
</del><ins>+ var i = 0;
+ if (paramList1.shape == "polygon") {
+ if (paramList1.params[0] != paramList2.params[0])
+ return false; // fill-rule's don't match
+ i++;
+ }
+ for (; i < paramList1.params.length; ++i) {
</ins><span class="cx"> var param1 = paramList1.params[i],
</span><span class="cx"> param2 = paramList2.params[i];
</span><span class="cx"> var match = isCloseEnough(param1, param2, tolerance);
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideanimationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt (160428 => 160429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt 2013-12-11 12:42:50 UTC (rev 160428)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt 2013-12-11 13:38:59 UTC (rev 160429)
</span><span class="lines">@@ -2,8 +2,10 @@
</span><span class="cx"> Moving Text
</span><span class="cx"> Moving Text
</span><span class="cx"> Moving Text
</span><ins>+Moving Text
</ins><span class="cx"> PASS - "webkitShapeOutside" property for "rectangle-box" element at 1s saw something close to: rectangle(10%, 10%, 80%, 80%, 0px, 0px)
</span><span class="cx"> PASS - "webkitShapeOutside" property for "circle-box" element at 1s saw something close to: circle(35% at 35% 35%)
</span><span class="cx"> PASS - "webkitShapeOutside" property for "ellipse-box" element at 1s saw something close to: ellipse(35% 30% at 35% 35%)
</span><span class="cx"> PASS - "webkitShapeOutside" property for "polygon-box" element at 1s saw something close to: polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)
</span><ins>+PASS - "webkitShapeOutside" property for "polygon2-box" element at 1s saw something close to: polygon(nonzero, 20% 20%, 80% 20%, 80% 80%, 20% 80%)
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideanimationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation.html (160428 => 160429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation.html 2013-12-11 12:42:50 UTC (rev 160428)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation.html 2013-12-11 13:38:59 UTC (rev 160429)
</span><span class="lines">@@ -30,6 +30,9 @@
</span><span class="cx"> -webkit-animation: polygon-anim 2s linear
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ #polygon2-box {
+ -webkit-animation: polygon2-anim 2s linear
+ }
</ins><span class="cx">
</span><span class="cx"> @-webkit-keyframes rectangle-anim {
</span><span class="cx"> from { -webkit-shape-outside: rectangle(0%, 0%, 100%, 100%); }
</span><span class="lines">@@ -51,6 +54,11 @@
</span><span class="cx"> to { -webkit-shape-outside: polygon(nonzero, 20% 20%, 80% 20%, 80% 80%, 20% 80%); }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ @-webkit-keyframes polygon2-anim {
+ from { -webkit-shape-outside: polygon(evenodd, 0% 0%, 100% 0%, 100% 100%, 0% 100%); }
+ to { -webkit-shape-outside: polygon(nonzero, 20% 20%, 80% 20%, 80% 80%, 20% 80%); }
+ }
+
</ins><span class="cx"> </style>
</span><span class="cx"> <script src="../../../animations/resources/animation-test-helpers.js"></script>
</span><span class="cx"> <script type="text/javascript">
</span><span class="lines">@@ -60,6 +68,7 @@
</span><span class="cx"> ["circle-anim", 1, "circle-box", "webkitShapeOutside", "circle(35% at 35% 35%)", 0.05],
</span><span class="cx"> ["ellipse-anim", 1, "ellipse-box", "webkitShapeOutside", "ellipse(35% 30% at 35% 35%)", 0.05],
</span><span class="cx"> ["polygon-anim", 1, "polygon-box", "webkitShapeOutside", "polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)", 0.05],
</span><ins>+ ["polygon2-anim", 1, "polygon2-box", "webkitShapeOutside", "polygon(nonzero, 20% 20%, 80% 20%, 80% 80%, 20% 80%)", 0.05],
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> runAnimationTest(expectedValues);
</span><span class="lines">@@ -83,6 +92,10 @@
</span><span class="cx"> <div class="box" id="polygon-box"></div>
</span><span class="cx"> Moving Text
</span><span class="cx"> </div>
</span><ins>+<div class='container'>
+ <div class="box" id="polygon2-box"></div>
+ Moving Text
+</div>
</ins><span class="cx">
</span><span class="cx"> <div id="result">
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160428 => 160429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-11 12:42:50 UTC (rev 160428)
+++ trunk/Source/WebCore/ChangeLog 2013-12-11 13:38:59 UTC (rev 160429)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-11 Rob Buis <rob.buis@samsung.com>
+
+ [CSS Shapes] Take into account fill-rule for polygon interpolation
+ https://bugs.webkit.org/show_bug.cgi?id=125508
+
+ Reviewed by Dirk Schulze.
+
+ Implement the polygon fill-rule part of http://dev.w3.org/csswg/css-shapes/#basic-shape-interpolation.
+
+ Adapt fast/shapes/shape-outside-floats/shape-outside-animation.html.
+
+ * rendering/style/BasicShapes.cpp:
+ (WebCore::BasicShape::canBlend):
+
</ins><span class="cx"> 2013-12-11 Mario Sanchez Prada <mario.prada@samsung.com>
</span><span class="cx">
</span><span class="cx"> Programmatically-inserted children lack accessibility events
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/BasicShapes.cpp (160428 => 160429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2013-12-11 12:42:50 UTC (rev 160428)
+++ trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2013-12-11 13:38:59 UTC (rev 160429)
</span><span class="lines">@@ -46,7 +46,8 @@
</span><span class="cx">
</span><span class="cx"> // Just polygons with same number of vertices can be animated.
</span><span class="cx"> if (type() == BasicShape::BasicShapePolygonType
</span><del>- && static_cast<const BasicShapePolygon*>(this)->values().size() != static_cast<const BasicShapePolygon*>(other)->values().size())
</del><ins>+ && (static_cast<const BasicShapePolygon*>(this)->values().size() != static_cast<const BasicShapePolygon*>(other)->values().size()
+ || static_cast<const BasicShapePolygon*>(this)->windRule() != static_cast<const BasicShapePolygon*>(other)->windRule()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Circles with keywords for radii or center coordinates cannot be animated.
</span></span></pre>
</div>
</div>
</body>
</html>