<!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>[165638] 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/165638">165638</a></dd>
<dt>Author</dt> <dd>betravis@adobe.com</dd>
<dt>Date</dt> <dd>2014-03-14 13:01:28 -0700 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] polygon default fill-rule should be omitted from the serialization
https://bugs.webkit.org/show_bug.cgi?id=129840
Reviewed by Dirk Schulze.
Source/WebCore:
Modifying the default polygon string opening to be "polygon(" rather than
"polygon(nonzero".
Updated existing parsing tests.
* css/CSSBasicShapes.cpp:
(WebCore::buildPolygonString):
LayoutTests:
Modifying tests to expect the default fill-rule to be omitted. In addition,
animation-test-helpers now parses its arguments as an unbounded list, rather
than as a fixed number of capturing parentheses.
* animations/resources/animation-test-helpers.js:
* css3/masking/clip-path-animation-expected.txt:
* css3/masking/clip-path-animation.html:
* fast/masking/parsing-clip-path-shape-expected.txt:
* fast/masking/parsing-clip-path-shape.html:
* fast/shapes/parsing/parsing-shape-inside-expected.txt:
* fast/shapes/parsing/parsing-shape-lengths-expected.txt:
* fast/shapes/parsing/parsing-shape-lengths.html:
* fast/shapes/parsing/parsing-shape-outside-expected.txt:
* fast/shapes/parsing/parsing-test-utils.js:
* fast/shapes/shape-inside/shape-inside-animation-expected.txt:
* fast/shapes/shape-inside/shape-inside-animation.html:
* 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="#trunkLayoutTestscss3maskingclippathanimationexpectedtxt">trunk/LayoutTests/css3/masking/clip-path-animation-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathanimationhtml">trunk/LayoutTests/css3/masking/clip-path-animation.html</a></li>
<li><a href="#trunkLayoutTestsfastmaskingparsingclippathshapeexpectedtxt">trunk/LayoutTests/fast/masking/parsing-clip-path-shape-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmaskingparsingclippathshapehtml">trunk/LayoutTests/fast/masking/parsing-clip-path-shape.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapeinsideexpectedtxt">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapelengthsexpectedtxt">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapelengthshtml">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingtestutilsjs">trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideanimationexpectedtxt">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeinsideshapeinsideanimationhtml">trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation.html</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="#trunkSourceWebCorecssCSSBasicShapescpp">trunk/Source/WebCore/css/CSSBasicShapes.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/ChangeLog 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-03-14 Bear Travis <betravis@adobe.com>
+
+ [CSS Shapes] polygon default fill-rule should be omitted from the serialization
+ https://bugs.webkit.org/show_bug.cgi?id=129840
+
+ Reviewed by Dirk Schulze.
+
+ Modifying tests to expect the default fill-rule to be omitted. In addition,
+ animation-test-helpers now parses its arguments as an unbounded list, rather
+ than as a fixed number of capturing parentheses.
+
+ * animations/resources/animation-test-helpers.js:
+ * css3/masking/clip-path-animation-expected.txt:
+ * css3/masking/clip-path-animation.html:
+ * fast/masking/parsing-clip-path-shape-expected.txt:
+ * fast/masking/parsing-clip-path-shape.html:
+ * fast/shapes/parsing/parsing-shape-inside-expected.txt:
+ * fast/shapes/parsing/parsing-shape-lengths-expected.txt:
+ * fast/shapes/parsing/parsing-shape-lengths.html:
+ * fast/shapes/parsing/parsing-shape-outside-expected.txt:
+ * fast/shapes/parsing/parsing-test-utils.js:
+ * fast/shapes/shape-inside/shape-inside-animation-expected.txt:
+ * fast/shapes/shape-inside/shape-inside-animation.html:
+ * fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt:
+ * fast/shapes/shape-outside-floats/shape-outside-animation.html:
+
</ins><span class="cx"> 2014-03-14 James Craig <jcraig@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: AXI: Expose Accessibility Tree parent of the selected node
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsresourcesanimationtesthelpersjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/resources/animation-test-helpers.js (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/resources/animation-test-helpers.js 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/animations/resources/animation-test-helpers.js 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -191,7 +191,12 @@
</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\\((evenodd|nonzero), (.*)\\s+(.*)\\s*,\\s*(.*)\\s+(.*)\\s*,\\s*(.*)\\s+(.*)\\s*,\\s*(.*)\\s+(.*)\\)");
</del><ins>+ matches = s.match("polygon\\(\\s*(.*)\\s*\\)");
+ matches = matches[1].split(/\s*,\s*/);
+ matches = matches.map(function(match) {
+ return match.split(/\s+/);
+ });
+ matches = Array.prototype.concat.apply([s], matches);
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> return null;
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathanimationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/masking/clip-path-animation-expected.txt (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-animation-expected.txt 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/css3/masking/clip-path-animation-expected.txt 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -2,6 +2,6 @@
</span><span class="cx"> PASS - "webkitClipPath" property for "inset-box" element at 1s saw something close to: inset(10% 10% 10% 10% round 0px 0px 0px 0px / 0px 0px 0px 0px)
</span><span class="cx"> PASS - "webkitClipPath" property for "circle-box" element at 1s saw something close to: circle(35% at 35% 35%)
</span><span class="cx"> PASS - "webkitClipPath" property for "ellipse-box" element at 1s saw something close to: ellipse(35% 30% at 35% 35%)
</span><del>-PASS - "webkitClipPath" property for "polygon-box" element at 1s saw something close to: polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)
-PASS - "webkitClipPath" property for "none-box" element at 1s saw something close to: polygon(nonzero, 20% 20%, 80% 20%, 80% 80%, 20% 80%)
</del><ins>+PASS - "webkitClipPath" property for "polygon-box" element at 1s saw something close to: polygon(10% 10%, 90% 10%, 90% 90%, 10% 90%)
+PASS - "webkitClipPath" property for "none-box" element at 1s saw something close to: polygon(20% 20%, 80% 20%, 80% 80%, 20% 80%)
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathanimationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/masking/clip-path-animation.html (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-animation.html 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/css3/masking/clip-path-animation.html 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx"> ["inset-anim", 1, "inset-box", "webkitClipPath", "inset(10% 10% 10% 10% round 0px 0px 0px 0px / 0px 0px 0px 0px)", 0.05],
</span><span class="cx"> ["circle-anim", 1, "circle-box", "webkitClipPath", "circle(35% at 35% 35%)", 0.05],
</span><span class="cx"> ["ellipse-anim", 1, "ellipse-box", "webkitClipPath", "ellipse(35% 30% at 35% 35%)", 0.05],
</span><del>- ["polygon-anim", 1, "polygon-box", "webkitClipPath", "polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)", 0.05],
- ["none-anim", 1, "none-box", "webkitClipPath", "polygon(nonzero, 20% 20%, 80% 20%, 80% 80%, 20% 80%)", 0],
</del><ins>+ ["polygon-anim", 1, "polygon-box", "webkitClipPath", "polygon(10% 10%, 90% 10%, 90% 90%, 10% 90%)", 0.05],
+ ["none-anim", 1, "none-box", "webkitClipPath", "polygon(20% 20%, 80% 20%, 80% 80%, 20% 80%)", 0],
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> runAnimationTest(expectedValues);
</span></span></pre></div>
<a id="trunkLayoutTestsfastmaskingparsingclippathshapeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/masking/parsing-clip-path-shape-expected.txt (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/masking/parsing-clip-path-shape-expected.txt 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/fast/masking/parsing-clip-path-shape-expected.txt 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "circle(150% at 50% 100%)") is "circle(150% at 50% 100%)"
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "inset(45% 45% 90% 60% round 25% 10%)") is "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)"
</span><span class="cx"> PASS computedStyle("-webkit-clip-path", "ellipse(100% 100% at 100% 100%)") is "ellipse(100% 100% at 100% 100%)"
</span><del>-PASS computedStyle("-webkit-clip-path", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)"
</del><ins>+PASS computedStyle("-webkit-clip-path", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(10% 20%, 30% 40%, 40% 50%)"
</ins><span class="cx"> PASS innerStyle("-webkit-clip-path", "content-box") is "content-box"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "padding-box") is "padding-box"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "border-box") is "border-box"
</span></span></pre></div>
<a id="trunkLayoutTestsfastmaskingparsingclippathshapehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/masking/parsing-clip-path-shape.html (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/masking/parsing-clip-path-shape.html 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/fast/masking/parsing-clip-path-shape.html 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> testComputed("-webkit-clip-path", "circle(150% at 50% 100%)", "circle(150% at 50% 100%)");
</span><span class="cx"> testComputed("-webkit-clip-path", "inset(45% 45% 90% 60% round 25% 10%)", "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)");
</span><span class="cx"> testComputed("-webkit-clip-path", "ellipse(100% 100% at 100% 100%)", "ellipse(100% 100% at 100% 100%)");
</span><del>-testComputed("-webkit-clip-path", "polygon(10% 20%, 30% 40%, 40% 50%)", "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)");
</del><ins>+testComputed("-webkit-clip-path", "polygon(10% 20%, 30% 40%, 40% 50%)", "polygon(10% 20%, 30% 40%, 40% 50%)");
</ins><span class="cx">
</span><span class="cx"> // boxes
</span><span class="cx"> testInner("-webkit-clip-path", "content-box", "content-box");
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeinsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -121,12 +121,12 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 10px at right 10% bottom 10%)") is "ellipse(10px 10px at 90% 90%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "ellipse(10px 10px at right 0px bottom 0px)") is "ellipse(10px 10px at 100% 100%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 10px at right 0px bottom 0px)") is "ellipse(10px 10px at 100% 100%)"
</span><del>-PASS getCSSText("-webkit-shape-inside", "polygon(10px 20px, 30px 40px, 40px 50px)") is "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px 20px, 30px 40px, 40px 50px)") is "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)"
</del><ins>+PASS getCSSText("-webkit-shape-inside", "polygon(10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)") is "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)") is "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)"
</span><del>-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)") is "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)") is "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)"
</del><ins>+PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "content-box") is "content-box"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "content-box") is "content-box"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "padding-box") is "padding-box"
</span><span class="lines">@@ -135,22 +135,22 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "border-box") is "border-box"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "margin-box") is "margin-box"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "margin-box") is "margin-box"
</span><del>-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box"
-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box"
-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box"
-PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box"
-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box"
-PASS getCSSText("-webkit-shape-inside", "content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box"
-PASS getCSSText("-webkit-shape-inside", "padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box"
-PASS getCSSText("-webkit-shape-inside", "border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box"
-PASS getCSSText("-webkit-shape-inside", "margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)"
-PASS getComputedStyleValue("-webkit-shape-inside", "margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box"
</del><ins>+PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box") is "polygon(0px 0px, 10px 10px, 10px 0px) content-box"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box") is "polygon(0px 0px, 10px 10px, 10px 0px) content-box"
+PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box") is "polygon(0px 0px, 10px 10px, 10px 0px) padding-box"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box") is "polygon(0px 0px, 10px 10px, 10px 0px) padding-box"
+PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box") is "polygon(0px 0px, 10px 10px, 10px 0px) border-box"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box") is "polygon(0px 0px, 10px 10px, 10px 0px) border-box"
+PASS getCSSText("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box") is "polygon(0px 0px, 10px 10px, 10px 0px) margin-box"
+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box") is "polygon(0px 0px, 10px 10px, 10px 0px) margin-box"
+PASS getCSSText("-webkit-shape-inside", "content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "content-box polygon(0px 0px, 10px 10px, 10px 0px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(0px 0px, 10px 10px, 10px 0px) content-box"
+PASS getCSSText("-webkit-shape-inside", "padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "padding-box polygon(0px 0px, 10px 10px, 10px 0px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(0px 0px, 10px 10px, 10px 0px) padding-box"
+PASS getCSSText("-webkit-shape-inside", "border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "border-box polygon(0px 0px, 10px 10px, 10px 0px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(0px 0px, 10px 10px, 10px 0px) border-box"
+PASS getCSSText("-webkit-shape-inside", "margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "margin-box polygon(0px 0px, 10px 10px, 10px 0px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(0px 0px, 10px 10px, 10px 0px) margin-box"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "outside-shape") is "outside-shape"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "outside-shape") is "outside-shape"
</span><span class="cx"> PASS removeBaseURL(getCSSText("-webkit-shape-inside", "url('image')")) is "url(image)"
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapelengthsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -28,11 +28,11 @@
</span><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "circle(100% at 100% 100%)") is "circle(100% at 100% 100%)"
</span><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "inset(45% 45% 90% 60% round 25% 10%)") is "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)"
</span><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "ellipse(100% 100% at 100% 100%)") is "ellipse(100% 100% at 100% 100%)"
</span><del>-PASS getStyleValue("-webkit-shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)"
</del><ins>+PASS getStyleValue("-webkit-shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(10% 20%, 30% 40%, 40% 50%)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(150% at 50% 100%)") is "circle(150% at 50% 100%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset(45% 45% 90% 60% round 25% 10%)") is "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(100% 100% at 100% 100%)") is "ellipse(100% 100% at 100% 100%)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(10% 20%, 30% 40%, 40% 50%)"
</ins><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "circle(1 at 1px 1px)") is null
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(1 at 1px 1px)") is "none"
</span><span class="cx"> PASS getStyleValue("-webkit-shape-inside", "circle(px at 1px 1px)") is null
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapelengthshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-lengths.html 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -72,12 +72,12 @@
</span><span class="cx"> testStyleValue("circle(100% at 100% 100%)", "circle(100% at 100% 100%)");
</span><span class="cx"> testStyleValue("inset(45% 45% 90% 60% round 25% 10%)", "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)");
</span><span class="cx"> testStyleValue("ellipse(100% 100% at 100% 100%)", "ellipse(100% 100% at 100% 100%)");
</span><del>-testStyleValue("polygon(10% 20%, 30% 40%, 40% 50%)", "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)");
</del><ins>+testStyleValue("polygon(10% 20%, 30% 40%, 40% 50%)", "polygon(10% 20%, 30% 40%, 40% 50%)");
</ins><span class="cx">
</span><span class="cx"> testComputedStyleValue("circle(150% at 50% 100%)", "circle(150% at 50% 100%)");
</span><span class="cx"> testComputedStyleValue("inset(45% 45% 90% 60% round 25% 10%)", "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)");
</span><span class="cx"> testComputedStyleValue("ellipse(100% 100% at 100% 100%)", "ellipse(100% 100% at 100% 100%)");
</span><del>-testComputedStyleValue("polygon(10% 20%, 30% 40%, 40% 50%)", "polygon(nonzero, 10% 20%, 30% 40%, 40% 50%)");
</del><ins>+testComputedStyleValue("polygon(10% 20%, 30% 40%, 40% 50%)", "polygon(10% 20%, 30% 40%, 40% 50%)");
</ins><span class="cx">
</span><span class="cx"> // reject non-lengths
</span><span class="cx"> testInvalidValue("-webkit-shape-outside", "circle(1 at 1px 1px)");
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -121,12 +121,12 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px 10px at right 10% bottom 10%)") is "ellipse(10px 10px at 90% 90%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px 10px at right 0px bottom 0px)") is "ellipse(10px 10px at 100% 100%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px 10px at right 0px bottom 0px)") is "ellipse(10px 10px at 100% 100%)"
</span><del>-PASS getCSSText("-webkit-shape-outside", "polygon(10px 20px, 30px 40px, 40px 50px)") is "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "polygon(10px 20px, 30px 40px, 40px 50px)") is "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)"
</del><ins>+PASS getCSSText("-webkit-shape-outside", "polygon(10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "polygon(10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)") is "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)") is "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)"
</span><del>-PASS getCSSText("-webkit-shape-outside", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)") is "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)") is "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)"
</del><ins>+PASS getCSSText("-webkit-shape-outside", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "content-box") is "content-box"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "content-box") is "content-box"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "padding-box") is "padding-box"
</span><span class="lines">@@ -135,22 +135,22 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "border-box") is "border-box"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "margin-box") is "margin-box"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "margin-box") is "margin-box"
</span><del>-PASS getCSSText("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box"
-PASS getComputedStyleValue("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box"
-PASS getCSSText("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box"
-PASS getComputedStyleValue("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box"
-PASS getCSSText("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box"
-PASS getComputedStyleValue("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box"
-PASS getCSSText("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box"
-PASS getComputedStyleValue("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box"
-PASS getCSSText("-webkit-shape-outside", "content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box"
-PASS getCSSText("-webkit-shape-outside", "padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box"
-PASS getCSSText("-webkit-shape-outside", "border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box"
-PASS getCSSText("-webkit-shape-outside", "margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)"
-PASS getComputedStyleValue("-webkit-shape-outside", "margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box"
</del><ins>+PASS getCSSText("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box") is "polygon(0px 0px, 10px 10px, 10px 0px) content-box"
+PASS getComputedStyleValue("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box") is "polygon(0px 0px, 10px 10px, 10px 0px) content-box"
+PASS getCSSText("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box") is "polygon(0px 0px, 10px 10px, 10px 0px) padding-box"
+PASS getComputedStyleValue("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box") is "polygon(0px 0px, 10px 10px, 10px 0px) padding-box"
+PASS getCSSText("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box") is "polygon(0px 0px, 10px 10px, 10px 0px) border-box"
+PASS getComputedStyleValue("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box") is "polygon(0px 0px, 10px 10px, 10px 0px) border-box"
+PASS getCSSText("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box") is "polygon(0px 0px, 10px 10px, 10px 0px) margin-box"
+PASS getComputedStyleValue("-webkit-shape-outside", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box") is "polygon(0px 0px, 10px 10px, 10px 0px) margin-box"
+PASS getCSSText("-webkit-shape-outside", "content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "content-box polygon(0px 0px, 10px 10px, 10px 0px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(0px 0px, 10px 10px, 10px 0px) content-box"
+PASS getCSSText("-webkit-shape-outside", "padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "padding-box polygon(0px 0px, 10px 10px, 10px 0px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(0px 0px, 10px 10px, 10px 0px) padding-box"
+PASS getCSSText("-webkit-shape-outside", "border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "border-box polygon(0px 0px, 10px 10px, 10px 0px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(0px 0px, 10px 10px, 10px 0px) border-box"
+PASS getCSSText("-webkit-shape-outside", "margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "margin-box polygon(0px 0px, 10px 10px, 10px 0px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)") is "polygon(0px 0px, 10px 10px, 10px 0px) margin-box"
</ins><span class="cx"> PASS removeBaseURL(getCSSText("-webkit-shape-outside", "url('image')")) is "url(image)"
</span><span class="cx"> PASS removeBaseURL(getComputedStyleValue("-webkit-shape-outside", "url('image')")) is "url(image)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "calc()") is ""
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingtestutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -68,24 +68,24 @@
</span><span class="cx"> ["ellipse(10px 10px at right 10% bottom 10%)", "ellipse(10px 10px at 90% 90%)"],
</span><span class="cx"> ["ellipse(10px 10px at right 0px bottom 0px)", "ellipse(10px 10px at 100% 100%)"],
</span><span class="cx">
</span><del>- ["polygon(10px 20px, 30px 40px, 40px 50px)", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)"],
</del><ins>+ ["polygon(10px 20px, 30px 40px, 40px 50px)", "polygon(10px 20px, 30px 40px, 40px 50px)"],
</ins><span class="cx"> ["polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)", "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)"],
</span><del>- ["polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)"],
</del><ins>+ ["polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)", "polygon(10px 20px, 30px 40px, 40px 50px)"],
</ins><span class="cx">
</span><span class="cx"> "content-box",
</span><span class="cx"> "padding-box",
</span><span class="cx"> "border-box",
</span><span class="cx"> "margin-box",
</span><span class="cx">
</span><del>- "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box",
- "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box",
- "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box",
- "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box",
</del><ins>+ ["polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box", "polygon(0px 0px, 10px 10px, 10px 0px) content-box"],
+ ["polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box", "polygon(0px 0px, 10px 10px, 10px 0px) padding-box"],
+ ["polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box", "polygon(0px 0px, 10px 10px, 10px 0px) border-box"],
+ ["polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box", "polygon(0px 0px, 10px 10px, 10px 0px) margin-box"],
</ins><span class="cx">
</span><del>- ["content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)", "content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) content-box"],
- ["padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)", "padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) padding-box"],
- ["border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)", "border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) border-box"],
- ["margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)", "margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)", "polygon(nonzero, 0px 0px, 10px 10px, 10px 0px) margin-box"]
</del><ins>+ ["content-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)", "content-box polygon(0px 0px, 10px 10px, 10px 0px)", "polygon(0px 0px, 10px 10px, 10px 0px) content-box"],
+ ["padding-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)", "padding-box polygon(0px 0px, 10px 10px, 10px 0px)", "polygon(0px 0px, 10px 10px, 10px 0px) padding-box"],
+ ["border-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)", "border-box polygon(0px 0px, 10px 10px, 10px 0px)", "polygon(0px 0px, 10px 10px, 10px 0px) border-box"],
+ ["margin-box polygon(nonzero, 0px 0px, 10px 10px, 10px 0px)", "margin-box polygon(0px 0px, 10px 10px, 10px 0px)", "polygon(0px 0px, 10px 10px, 10px 0px) margin-box"]
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> // Invalid values for both shape-inside and shape-outside. When an invalid shape value is specified, the
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideanimationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation-expected.txt (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation-expected.txt 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation-expected.txt 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -2,5 +2,5 @@
</span><span class="cx"> PASS - "webkitShapeInside" property for "inset-box" element at 1s saw something close to: inset(10% 10% 10% 10% round 0px 0px 0px 0px / 0px 0px 0px 0px)
</span><span class="cx"> PASS - "webkitShapeInside" property for "circle-box" element at 1s saw something close to: circle(35% at 35% 35%)
</span><span class="cx"> PASS - "webkitShapeInside" property for "ellipse-box" element at 1s saw something close to: ellipse(35% 30% at 35% 35%)
</span><del>-PASS - "webkitShapeInside" property for "polygon-box" element at 1s saw something close to: polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)
</del><ins>+PASS - "webkitShapeInside" property for "polygon-box" element at 1s saw something close to: polygon(10% 10%, 90% 10%, 90% 90%, 10% 90%)
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeinsideshapeinsideanimationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation.html (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation.html 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-animation.html 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> ["inset-anim", 1, "inset-box", "webkitShapeInside", "inset(10% 10% 10% 10% round 0px 0px 0px 0px / 0px 0px 0px 0px)", 0.05],
</span><span class="cx"> ["circle-anim", 1, "circle-box", "webkitShapeInside", "circle(35% at 35% 35%)", 0.05],
</span><span class="cx"> ["ellipse-anim", 1, "ellipse-box", "webkitShapeInside", "ellipse(35% 30% at 35% 35%)", 0.05],
</span><del>- ["polygon-anim", 1, "polygon-box", "webkitShapeInside", "polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)", 0.05],
</del><ins>+ ["polygon-anim", 1, "polygon-box", "webkitShapeInside", "polygon(10% 10%, 90% 10%, 90% 90%, 10% 90%)", 0.05],
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> runAnimationTest(expectedValues);
</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 (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation-expected.txt 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -14,8 +14,8 @@
</span><span class="cx"> PASS - "webkitShapeOutside" property for "inset-box" element at 1s saw something close to: inset(10% 10% 10% 10% round 0px 0px 0px 0px / 0px 0px 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><del>-PASS - "webkitShapeOutside" property for "polygon-box" element at 1s saw something close to: polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)
-PASS - "webkitShapeOutside" property for "polygon2-box" element at 1s saw something close to: polygon(nonzero, 20% 20%, 80% 20%, 80% 80%, 20% 80%)
</del><ins>+PASS - "webkitShapeOutside" property for "polygon-box" element at 1s saw something close to: polygon(10% 10%, 90% 10%, 90% 90%, 10% 90%)
+PASS - "webkitShapeOutside" property for "polygon2-box" element at 1s saw something close to: polygon(20% 20%, 80% 20%, 80% 80%, 20% 80%)
</ins><span class="cx"> PASS - "webkitShapeOutside" property for "circle-auto-box" element at 1s saw something close to: circle(50% at 50% 50%)
</span><span class="cx"> PASS - "webkitShapeOutside" property for "circle-to-topleft-box" element at 1s saw something close to: circle(35% at 25% 25%)
</span><span class="cx"> PASS - "webkitShapeOutside" property for "circle-to-topleft-box" element at 1s saw something close to: circle(35% at 25% 25%)
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsideanimationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation.html (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation.html 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-animation.html 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -82,8 +82,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes polygon-anim {
</span><del>- from { -webkit-shape-outside: polygon(nonzero, 0% 0%, 100% 0%, 100% 100%, 0% 100%); }
- to { -webkit-shape-outside: polygon(nonzero, 20% 20%, 80% 20%, 80% 80%, 20% 80%); }
</del><ins>+ from { -webkit-shape-outside: polygon(0% 0%, 100% 0%, 100% 100%, 0% 100%); }
+ to { -webkit-shape-outside: polygon(20% 20%, 80% 20%, 80% 80%, 20% 80%); }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @-webkit-keyframes polygon2-anim {
</span><span class="lines">@@ -138,8 +138,8 @@
</span><span class="cx"> ["inset-anim", 1, "inset-box", "webkitShapeOutside", "inset(10% 10% 10% 10% round 0px 0px 0px 0px / 0px 0px 0px 0px)", 0.05],
</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><del>- ["polygon-anim", 1, "polygon-box", "webkitShapeOutside", "polygon(nonzero, 10% 10%, 90% 10%, 90% 90%, 10% 90%)", 0.05],
- ["polygon2-anim", 1, "polygon2-box", "webkitShapeOutside", "polygon(nonzero, 20% 20%, 80% 20%, 80% 80%, 20% 80%)", 0.05],
</del><ins>+ ["polygon-anim", 1, "polygon-box", "webkitShapeOutside", "polygon(10% 10%, 90% 10%, 90% 90%, 10% 90%)", 0.05],
+ ["polygon2-anim", 1, "polygon2-box", "webkitShapeOutside", "polygon(20% 20%, 80% 20%, 80% 80%, 20% 80%)", 0.05],
</ins><span class="cx"> ["circle-auto-anim", 1, "circle-auto-box", "webkitShapeOutside", "circle(50% at 50% 50%)", 0.05],
</span><span class="cx"> ["circle-to-topleft-anim", 1, "circle-to-topleft-box", "webkitShapeOutside", "circle(35% at 25% 25%)", 0.05],
</span><span class="cx"> ["circle-to-topleft-anim", 1, "circle-to-topleft-box", "webkitShapeOutside", "circle(35% at 25% 25%)", 0.05],
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/Source/WebCore/ChangeLog 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-14 Bear Travis <betravis@adobe.com>
+
+ [CSS Shapes] polygon default fill-rule should be omitted from the serialization
+ https://bugs.webkit.org/show_bug.cgi?id=129840
+
+ Reviewed by Dirk Schulze.
+
+ Modifying the default polygon string opening to be "polygon(" rather than
+ "polygon(nonzero".
+
+ Updated existing parsing tests.
+
+ * css/CSSBasicShapes.cpp:
+ (WebCore::buildPolygonString):
+
</ins><span class="cx"> 2014-03-14 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when using a mixture of In-Band and Out-of-Band Tracks
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.cpp (165637 => 165638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-03-14 19:49:35 UTC (rev 165637)
+++ trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-03-14 20:01:28 UTC (rev 165638)
</span><span class="lines">@@ -198,10 +198,10 @@
</span><span class="cx">
</span><span class="cx"> StringBuilder result;
</span><span class="cx"> char evenOddOpening[] = "polygon(evenodd, ";
</span><del>- char nonZeroOpening[] = "polygon(nonzero, ";
</del><ins>+ char nonZeroOpening[] = "polygon(";
</ins><span class="cx"> char commaSeparator[] = ", ";
</span><del>- COMPILE_ASSERT(sizeof(evenOddOpening) == sizeof(nonZeroOpening), polygon_string_openings_have_same_length);
-
</del><ins>+ COMPILE_ASSERT(sizeof(evenOddOpening) >= sizeof(nonZeroOpening), polygon_evenodd_is_longest_string_opening);
+
</ins><span class="cx"> // Compute the required capacity in advance to reduce allocations.
</span><span class="cx"> size_t length = sizeof(evenOddOpening) - 1;
</span><span class="cx"> for (size_t i = 0; i < points.size(); i += 2) {
</span></span></pre>
</div>
</div>
</body>
</html>