<!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>[169406] 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/169406">169406</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-27 17:28:52 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] serialization of the computed value should omit the default radii
https://bugs.webkit.org/show_bug.cgi?id=132747
Reviewed by Darin Adler.
Source/WebCore:
We should omit closest-side value, whereever is possible. Specification:
http://www.w3.org/TR/2014/CR-css-shapes-1-20140320/#basic-shape-computed-values
This change aligns the behavior to the specification.
Added new test cases for the shape-outside parsing tests.
* css/CSSBasicShapes.cpp:
(WebCore::buildCircleString):
(WebCore::CSSBasicShapeCircle::cssText):
(WebCore::CSSBasicShapeEllipse::cssText):
LayoutTests:
* fast/shapes/parsing/parsing-shape-outside-expected.txt:
* fast/shapes/parsing/parsing-test-utils.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#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 (169405 => 169406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-28 00:16:25 UTC (rev 169405)
+++ trunk/LayoutTests/ChangeLog 2014-05-28 00:28:52 UTC (rev 169406)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-27 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] serialization of the computed value should omit the default radii
+ https://bugs.webkit.org/show_bug.cgi?id=132747
+
+ Reviewed by Darin Adler.
+
+ * fast/shapes/parsing/parsing-shape-outside-expected.txt:
+ * fast/shapes/parsing/parsing-test-utils.js:
+
</ins><span class="cx"> 2014-05-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed Mac Gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt (169405 => 169406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-05-28 00:16:25 UTC (rev 169405)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-05-28 00:28:52 UTC (rev 169406)
</span><span class="lines">@@ -70,11 +70,13 @@
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "inset(10px 10px 10px 10px round calc(25%*3 - 10in))") is "inset(10px round calc(75% - 10in))"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px 10px 10px 10px round calc(25%*3 - 10in))") is "inset(10px round calc(75% - 960px))"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle()") is "circle(at 50% 50%)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "circle()") is "circle(closest-side at 50% 50%)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "circle()") is "circle(at 50% 50%)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(farthest-side)") is "circle(farthest-side at 50% 50%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(farthest-side)") is "circle(farthest-side at 50% 50%)"
</span><del>-PASS getCSSText("-webkit-shape-outside", "circle(closest-side)") is "circle(closest-side at 50% 50%)"
-PASS getComputedStyleValue("-webkit-shape-outside", "circle(closest-side)") is "circle(closest-side at 50% 50%)"
</del><ins>+PASS getCSSText("-webkit-shape-outside", "circle()") is "circle(at 50% 50%)"
+PASS getComputedStyleValue("-webkit-shape-outside", "circle()") is "circle(at 50% 50%)"
+PASS getCSSText("-webkit-shape-outside", "circle(closest-side at 50px 50px)") is "circle(at 50px 50px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(closest-side at 50px 50px)") is "circle(at 50px 50px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(10px)") is "circle(10px at 50% 50%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px)") is "circle(10px at 50% 50%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(10px at 10px)") is "circle(10px at 10px 50%)"
</span><span class="lines">@@ -82,13 +84,13 @@
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(10px at 10px 10px)") is "circle(10px at 10px 10px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px at 10px 10px)") is "circle(10px at 10px 10px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(at 10px)") is "circle(at 10px 50%)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "circle(at 10px)") is "circle(closest-side at 10px 50%)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "circle(at 10px)") is "circle(at 10px 50%)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(at 10px 10px)") is "circle(at 10px 10px)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "circle(at 10px 10px)") is "circle(closest-side at 10px 10px)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "circle(at 10px 10px)") is "circle(at 10px 10px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(at top left)") is "circle(at 0% 0%)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "circle(at top left)") is "circle(closest-side at 0% 0%)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "circle(at top left)") is "circle(at 0% 0%)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(at right bottom)") is "circle(at 100% 100%)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "circle(at right bottom)") is "circle(closest-side at 100% 100%)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "circle(at right bottom)") is "circle(at 100% 100%)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(10px at left top 10px)") is "circle(10px at 0% 10px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px at left top 10px)") is "circle(10px at 0% 10px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(10px at top 10px left 10px)") is "circle(10px at 10px 10px)"
</span><span class="lines">@@ -100,31 +102,31 @@
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(10px at right 10px bottom 10px)") is "circle(10px at right 10px bottom 10px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px at right 10px bottom 10px)") is "circle(10px at right 10px bottom 10px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse()") is "ellipse(at 50% 50%)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse()") is "ellipse(closest-side closest-side at 50% 50%)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse()") is "ellipse(at 50% 50%)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px)") is "ellipse(10px at 50% 50%)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px)") is "ellipse(10px closest-side at 50% 50%)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px)") is "ellipse(10px at 50% 50%)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px 20px)") is "ellipse(10px 20px at 50% 50%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px 20px)") is "ellipse(10px 20px at 50% 50%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px at 10px)") is "ellipse(10px at 10px 50%)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px at 10px)") is "ellipse(10px closest-side at 10px 50%)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px at 10px)") is "ellipse(10px at 10px 50%)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px 20px at 10px)") is "ellipse(10px 20px at 10px 50%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px 20px at 10px)") is "ellipse(10px 20px at 10px 50%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px at 10px 10px)") is "ellipse(10px at 10px 10px)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px at 10px 10px)") is "ellipse(10px closest-side at 10px 10px)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px at 10px 10px)") is "ellipse(10px at 10px 10px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(at 10px)") is "ellipse(at 10px 50%)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(at 10px)") is "ellipse(closest-side closest-side at 10px 50%)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(at 10px)") is "ellipse(at 10px 50%)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(at 10px 10px)") is "ellipse(at 10px 10px)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(at 10px 10px)") is "ellipse(closest-side closest-side at 10px 10px)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(at 10px 10px)") is "ellipse(at 10px 10px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(at top left)") is "ellipse(at 0% 0%)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(at top left)") is "ellipse(closest-side closest-side at 0% 0%)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(at top left)") is "ellipse(at 0% 0%)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(at right bottom)") is "ellipse(at 100% 100%)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(at right bottom)") is "ellipse(closest-side closest-side at 100% 100%)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(at right bottom)") is "ellipse(at 100% 100%)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px at left top 10px)") is "ellipse(10px at 0% 10px)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px at left top 10px)") is "ellipse(10px closest-side at 0% 10px)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px at left top 10px)") is "ellipse(10px at 0% 10px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px at top 10px left 10px)") is "ellipse(10px at 10px 10px)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px at top 10px left 10px)") is "ellipse(10px closest-side at 10px 10px)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px at top 10px left 10px)") is "ellipse(10px at 10px 10px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px at right 10px bottom 10px)") is "ellipse(10px at right 10px bottom 10px)"
</span><del>-PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px at right 10px bottom 10px)") is "ellipse(10px closest-side at right 10px bottom 10px)"
</del><ins>+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px at right 10px bottom 10px)") is "ellipse(10px at right 10px bottom 10px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px 20px at left top 10px)") is "ellipse(10px 20px at 0% 10px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px 20px at left top 10px)") is "ellipse(10px 20px at 0% 10px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px 20px at top 10px left 10px)") is "ellipse(10px 20px at 10px 10px)"
</span><span class="lines">@@ -135,6 +137,14 @@
</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><ins>+PASS getCSSText("-webkit-shape-outside", "ellipse(closest-side closest-side at 50px 50px)") is "ellipse(at 50px 50px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(closest-side closest-side at 50px 50px)") is "ellipse(at 50px 50px)"
+PASS getCSSText("-webkit-shape-outside", "ellipse(farthest-side farthest-side at 50px 50px)") is "ellipse(farthest-side farthest-side at 50px 50px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(farthest-side farthest-side at 50px 50px)") is "ellipse(farthest-side farthest-side at 50px 50px)"
+PASS getCSSText("-webkit-shape-outside", "ellipse(closest-side farthest-side at 50px 50px)") is "ellipse(closest-side farthest-side at 50px 50px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(closest-side farthest-side at 50px 50px)") is "ellipse(closest-side farthest-side at 50px 50px)"
+PASS getCSSText("-webkit-shape-outside", "ellipse(farthest-side closest-side at 50px 50px)") is "ellipse(farthest-side at 50px 50px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(farthest-side closest-side at 50px 50px)") is "ellipse(farthest-side at 50px 50px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "polygon(10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "polygon(10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
</span><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></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingtestutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js (169405 => 169406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-05-28 00:16:25 UTC (rev 169405)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-05-28 00:28:52 UTC (rev 169406)
</span><span class="lines">@@ -41,40 +41,46 @@
</span><span class="cx"> ["inset(calc(25%*3 - 10in) 0 0 0)", "inset(calc(75% - 10in) 0px 0px)", "inset(calc(75% - 960px) 0px 0px)"],
</span><span class="cx"> ["inset(10px 10px 10px 10px round calc(25%*3 - 10in))", "inset(10px round calc(75% - 10in))", "inset(10px round calc(75% - 960px))"],
</span><span class="cx">
</span><del>- ["circle()", "circle(at 50% 50%)", "circle(closest-side at 50% 50%)"],
</del><ins>+ ["circle()", "circle(at 50% 50%)", "circle(at 50% 50%)"],
</ins><span class="cx"> ["circle(farthest-side)", "circle(farthest-side at 50% 50%)", "circle(farthest-side at 50% 50%)"],
</span><del>- ["circle(closest-side)", "circle(closest-side at 50% 50%)", "circle(closest-side at 50% 50%)"],
</del><ins>+ ["circle()", "circle(at 50% 50%)", "circle(at 50% 50%)"],
+ ["circle(closest-side at 50px 50px)", "circle(at 50px 50px)", "circle(at 50px 50px)"],
</ins><span class="cx"> ["circle(10px)", "circle(10px at 50% 50%)", "circle(10px at 50% 50%)"],
</span><span class="cx"> ["circle(10px at 10px)", "circle(10px at 10px 50%)"],
</span><span class="cx"> "circle(10px at 10px 10px)",
</span><del>- ["circle(at 10px)", "circle(at 10px 50%)", "circle(closest-side at 10px 50%)"],
- ["circle(at 10px 10px)", "circle(at 10px 10px)", "circle(closest-side at 10px 10px)"],
- ["circle(at top left)", "circle(at 0% 0%)", "circle(closest-side at 0% 0%)"],
- ["circle(at right bottom)", "circle(at 100% 100%)", "circle(closest-side at 100% 100%)"],
</del><ins>+ ["circle(at 10px)", "circle(at 10px 50%)", "circle(at 10px 50%)"],
+ ["circle(at 10px 10px)", "circle(at 10px 10px)", "circle(at 10px 10px)"],
+ ["circle(at top left)", "circle(at 0% 0%)", "circle(at 0% 0%)"],
+ ["circle(at right bottom)", "circle(at 100% 100%)", "circle(at 100% 100%)"],
</ins><span class="cx"> ["circle(10px at left top 10px)", "circle(10px at 0% 10px)", "circle(10px at 0% 10px)"],
</span><span class="cx"> ["circle(10px at top 10px left 10px)", "circle(10px at 10px 10px)", "circle(10px at 10px 10px)"],
</span><span class="cx"> ["circle(10px at right 10% bottom 10%)", "circle(10px at 90% 90%)"],
</span><span class="cx"> ["circle(10px at right 0px bottom 0px)", "circle(10px at 100% 100%)"],
</span><span class="cx"> ["circle(10px at right 10px bottom 10px)", "circle(10px at right 10px bottom 10px)"],
</span><span class="cx">
</span><del>- ["ellipse()", "ellipse(at 50% 50%)", "ellipse(closest-side closest-side at 50% 50%)"],
- ["ellipse(10px)", "ellipse(10px at 50% 50%)", "ellipse(10px closest-side at 50% 50%)"],
</del><ins>+
+ ["ellipse()", "ellipse(at 50% 50%)", "ellipse(at 50% 50%)"],
+ ["ellipse(10px)", "ellipse(10px at 50% 50%)", "ellipse(10px at 50% 50%)"],
</ins><span class="cx"> ["ellipse(10px 20px)", "ellipse(10px 20px at 50% 50%)", "ellipse(10px 20px at 50% 50%)"],
</span><del>- ["ellipse(10px at 10px)", "ellipse(10px at 10px 50%)", "ellipse(10px closest-side at 10px 50%)"],
</del><ins>+ ["ellipse(10px at 10px)", "ellipse(10px at 10px 50%)", "ellipse(10px at 10px 50%)"],
</ins><span class="cx"> ["ellipse(10px 20px at 10px)", "ellipse(10px 20px at 10px 50%)"],
</span><del>- ["ellipse(10px at 10px 10px)", "ellipse(10px at 10px 10px)", "ellipse(10px closest-side at 10px 10px)"],
- ["ellipse(at 10px)", "ellipse(at 10px 50%)", "ellipse(closest-side closest-side at 10px 50%)"],
- ["ellipse(at 10px 10px)", "ellipse(at 10px 10px)", "ellipse(closest-side closest-side at 10px 10px)"],
- ["ellipse(at top left)", "ellipse(at 0% 0%)", "ellipse(closest-side closest-side at 0% 0%)"],
- ["ellipse(at right bottom)", "ellipse(at 100% 100%)", "ellipse(closest-side closest-side at 100% 100%)"],
- ["ellipse(10px at left top 10px)", "ellipse(10px at 0% 10px)", "ellipse(10px closest-side at 0% 10px)"],
- ["ellipse(10px at top 10px left 10px)", "ellipse(10px at 10px 10px)", "ellipse(10px closest-side at 10px 10px)"],
- ["ellipse(10px at right 10px bottom 10px)", "ellipse(10px at right 10px bottom 10px)", "ellipse(10px closest-side at right 10px bottom 10px)"],
</del><ins>+ ["ellipse(10px at 10px 10px)", "ellipse(10px at 10px 10px)", "ellipse(10px at 10px 10px)"],
+ ["ellipse(at 10px)", "ellipse(at 10px 50%)", "ellipse(at 10px 50%)"],
+ ["ellipse(at 10px 10px)", "ellipse(at 10px 10px)", "ellipse(at 10px 10px)"],
+ ["ellipse(at top left)", "ellipse(at 0% 0%)", "ellipse(at 0% 0%)"],
+ ["ellipse(at right bottom)", "ellipse(at 100% 100%)", "ellipse(at 100% 100%)"],
+ ["ellipse(10px at left top 10px)", "ellipse(10px at 0% 10px)", "ellipse(10px at 0% 10px)"],
+ ["ellipse(10px at top 10px left 10px)", "ellipse(10px at 10px 10px)", "ellipse(10px at 10px 10px)"],
+ ["ellipse(10px at right 10px bottom 10px)", "ellipse(10px at right 10px bottom 10px)", "ellipse(10px at right 10px bottom 10px)"],
</ins><span class="cx"> ["ellipse(10px 20px at left top 10px)", "ellipse(10px 20px at 0% 10px)", "ellipse(10px 20px at 0% 10px)"],
</span><span class="cx"> ["ellipse(10px 20px at top 10px left 10px)", "ellipse(10px 20px at 10px 10px)", "ellipse(10px 20px at 10px 10px)"],
</span><span class="cx"> ["ellipse(10px 20px at right 10px bottom 10px)", "ellipse(10px 20px at right 10px bottom 10px)"],
</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><ins>+ ["ellipse(closest-side closest-side at 50px 50px)", "ellipse(at 50px 50px)", "ellipse(at 50px 50px)"],
+ ["ellipse(farthest-side farthest-side at 50px 50px)", "ellipse(farthest-side farthest-side at 50px 50px)", "ellipse(farthest-side farthest-side at 50px 50px)"],
+ ["ellipse(closest-side farthest-side at 50px 50px)", "ellipse(closest-side farthest-side at 50px 50px)", "ellipse(closest-side farthest-side at 50px 50px)"],
+ ["ellipse(farthest-side closest-side at 50px 50px)", "ellipse(farthest-side at 50px 50px)", "ellipse(farthest-side at 50px 50px)"],
</ins><span class="cx">
</span><span class="cx"> ["polygon(10px 20px, 30px 40px, 40px 50px)", "polygon(10px 20px, 30px 40px, 40px 50px)"],
</span><span class="cx"> ["polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)", "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)"],
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169405 => 169406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-28 00:16:25 UTC (rev 169405)
+++ trunk/Source/WebCore/ChangeLog 2014-05-28 00:28:52 UTC (rev 169406)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-27 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] serialization of the computed value should omit the default radii
+ https://bugs.webkit.org/show_bug.cgi?id=132747
+
+ Reviewed by Darin Adler.
+
+ We should omit closest-side value, whereever is possible. Specification:
+ http://www.w3.org/TR/2014/CR-css-shapes-1-20140320/#basic-shape-computed-values
+ This change aligns the behavior to the specification.
+
+ Added new test cases for the shape-outside parsing tests.
+
+ * css/CSSBasicShapes.cpp:
+ (WebCore::buildCircleString):
+ (WebCore::CSSBasicShapeCircle::cssText):
+ (WebCore::CSSBasicShapeEllipse::cssText):
+
</ins><span class="cx"> 2014-05-27 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r169399.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.cpp (169405 => 169406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-05-28 00:16:25 UTC (rev 169405)
+++ trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-05-28 00:28:52 UTC (rev 169406)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> char separator[] = " ";
</span><span class="cx"> StringBuilder result;
</span><span class="cx"> result.appendLiteral(opening);
</span><del>- if (!radius.isNull())
</del><ins>+ if (!radius.isNull())
</ins><span class="cx"> result.append(radius);
</span><span class="cx">
</span><span class="cx"> if (!centerX.isNull() || !centerY.isNull()) {
</span><span class="lines">@@ -113,7 +113,11 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft);
</span><span class="cx"> RefPtr<CSSPrimitiveValue> normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop);
</span><span class="cx">
</span><del>- return buildCircleString(m_radius ? m_radius->cssText() : String(),
</del><ins>+ String radius;
+ if (m_radius && m_radius->getValueID() != CSSValueClosestSide)
+ radius = m_radius->cssText();
+
+ return buildCircleString(radius,
</ins><span class="cx"> serializePositionOffset(*normalizedCX->getPairValue(), *normalizedCY->getPairValue()),
</span><span class="cx"> serializePositionOffset(*normalizedCY->getPairValue(), *normalizedCX->getPairValue()),
</span><span class="cx"> m_referenceBox ? m_referenceBox->cssText() : String());
</span><span class="lines">@@ -172,8 +176,21 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft);
</span><span class="cx"> RefPtr<CSSPrimitiveValue> normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop);
</span><span class="cx">
</span><del>- return buildEllipseString(m_radiusX ? m_radiusX->cssText() : String(),
- m_radiusY ? m_radiusY->cssText() : String(),
</del><ins>+ String radiusX;
+ String radiusY;
+ if (m_radiusX) {
+ bool shouldSerializeRadiusXValue = m_radiusX->getValueID() != CSSValueClosestSide;
+ bool shouldSerializeRadiusYValue = false;
+
+ if (m_radiusY) {
+ shouldSerializeRadiusYValue = m_radiusY->getValueID() != CSSValueClosestSide;
+ if (shouldSerializeRadiusYValue)
+ radiusY = m_radiusY->cssText();
+ }
+ if (shouldSerializeRadiusXValue || (!shouldSerializeRadiusXValue && shouldSerializeRadiusYValue))
+ radiusX = m_radiusX->cssText();
+ }
+ return buildEllipseString(radiusX, radiusY,
</ins><span class="cx"> serializePositionOffset(*normalizedCX->getPairValue(), *normalizedCY->getPairValue()),
</span><span class="cx"> serializePositionOffset(*normalizedCY->getPairValue(), *normalizedCX->getPairValue()),
</span><span class="cx"> m_referenceBox ? m_referenceBox->cssText() : String());
</span></span></pre>
</div>
</div>
</body>
</html>