<!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>[164998] 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/164998">164998</a></dd>
<dt>Author</dt> <dd>betravis@adobe.com</dd>
<dt>Date</dt> <dd>2014-03-03 12:24:30 -0800 (Mon, 03 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Serialize circle positions
https://bugs.webkit.org/show_bug.cgi?id=129404
Reviewed by Dirk Schulze.
Source/WebCore:
Circle positions should always be present when serialized, and should
only have the 2 or 4-valued form. Keywords are converted to percentages
and simplified where possible. This patch adds some additional processing
that converts the parsed position into the serialized format, before
converting it to text. See http://dev.w3.org/csswg/css-shapes/#basic-shape-serialization.
Updated existing parsing tests.
* css/CSSBasicShapes.cpp:
(WebCore::serializePositionOffset): Convert a position offset to a serialized string.
The offset must be a pair, as generated by buildSerializablePositionOffset.
(WebCore::buildSerializablePositionOffset): Generates a keyword + offset pair for each
position offset. The keywords may later be dropped during serialization.
(WebCore::CSSBasicShapeCircle::cssText): Use the new serialization methods.
LayoutTests:
Modify each circle test to have a correctly serialized position.
* fast/masking/parsing-clip-path-shape-expected.html: Updated result.
* fast/masking/parsing-clip-path-shape.html: Updated test.
* fast/shapes/parsing/parsing-shape-inside-expected.txt: Updated results.
* fast/shapes/parsing/parsing-shape-outside-expected.txt: Updated results.
* fast/shapes/parsing/parsing-test-utils.js: Updated serialization results.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#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 (164997 => 164998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-03 20:01:26 UTC (rev 164997)
+++ trunk/LayoutTests/ChangeLog 2014-03-03 20:24:30 UTC (rev 164998)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-03 Bear Travis <betravis@adobe.com>
+
+ [CSS Shapes] Serialize circle positions
+ https://bugs.webkit.org/show_bug.cgi?id=129404
+
+ Reviewed by Dirk Schulze.
+
+ Modify each circle test to have a correctly serialized position.
+
+ * fast/masking/parsing-clip-path-shape-expected.html: Updated result.
+ * fast/masking/parsing-clip-path-shape.html: Updated test.
+ * fast/shapes/parsing/parsing-shape-inside-expected.txt: Updated results.
+ * fast/shapes/parsing/parsing-shape-outside-expected.txt: Updated results.
+ * fast/shapes/parsing/parsing-test-utils.js: Updated serialization results.
+
</ins><span class="cx"> 2014-03-03 Dirk Schulze <krit@webkit.org>
</span><span class="cx">
</span><span class="cx"> Transform CSS clip-path pixel tests to ref tests
</span></span></pre></div>
<a id="trunkLayoutTestsfastmaskingparsingclippathshapeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/masking/parsing-clip-path-shape-expected.txt (164997 => 164998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/masking/parsing-clip-path-shape-expected.txt 2014-03-03 20:01:26 UTC (rev 164997)
+++ trunk/LayoutTests/fast/masking/parsing-clip-path-shape-expected.txt 2014-03-03 20:24:30 UTC (rev 164998)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(-1px, +1px, 1px)") is "circle(-1px, 1px, 1px)"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(-1.5px, +1.5px, 1.5px)") is "circle(-1.5px, 1.5px, 1.5px)"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(-.5px, +.5px, .5px)") is "circle(-0.5px, 0.5px, 0.5px)"
</span><del>-PASS innerStyle("-webkit-clip-path", "circle(0 at 0 0)") is "circle(0px at 0px 0px)"
</del><ins>+PASS innerStyle("-webkit-clip-path", "circle(0 at 0 0)") is "circle(0px at 0% 0%)"
</ins><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(1px at -1px +1px)") is "circle(1px at -1px 1px)"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(1.5px at -1.5px +1.5px)") is "circle(1.5px at -1.5px 1.5px)"
</span><span class="cx"> PASS innerStyle("-webkit-clip-path", "circle(.5px at -.5px +.5px)") is "circle(0.5px at -0.5px 0.5px)"
</span></span></pre></div>
<a id="trunkLayoutTestsfastmaskingparsingclippathshapehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/masking/parsing-clip-path-shape.html (164997 => 164998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/masking/parsing-clip-path-shape.html 2014-03-03 20:01:26 UTC (rev 164997)
+++ trunk/LayoutTests/fast/masking/parsing-clip-path-shape.html 2014-03-03 20:24:30 UTC (rev 164998)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> testInner("-webkit-clip-path", "circle(-1.5px, +1.5px, 1.5px)", "circle(-1.5px, 1.5px, 1.5px)");
</span><span class="cx"> testInner("-webkit-clip-path", "circle(-.5px, +.5px, .5px)", "circle(-0.5px, 0.5px, 0.5px)");
</span><span class="cx">
</span><del>-testInner("-webkit-clip-path", "circle(0 at 0 0)", "circle(0px at 0px 0px)");
</del><ins>+testInner("-webkit-clip-path", "circle(0 at 0 0)", "circle(0px at 0% 0%)");
</ins><span class="cx"> testInner("-webkit-clip-path", "circle(1px at -1px +1px)", "circle(1px at -1px 1px)");
</span><span class="cx"> testInner("-webkit-clip-path", "circle(1.5px at -1.5px +1.5px)", "circle(1.5px at -1.5px 1.5px)");
</span><span class="cx"> testInner("-webkit-clip-path", "circle(.5px at -.5px +.5px)", "circle(0.5px at -0.5px 0.5px)");
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeinsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt (164997 => 164998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-03-03 20:01:26 UTC (rev 164997)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-03-03 20:24:30 UTC (rev 164998)
</span><span class="lines">@@ -69,13 +69,13 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)") is "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(10px, 20px, 30px)") is "circle(10px, 20px, 30px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px, 20px, 30px)") is "circle(10px, 20px, 30px)"
</span><del>-PASS getCSSText("-webkit-shape-inside", "circle()") is "circle()"
</del><ins>+PASS getCSSText("-webkit-shape-inside", "circle()") is "circle(at 50% 50%)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle()") is "circle(closest-side at 50% 50%)"
</span><del>-PASS getCSSText("-webkit-shape-inside", "circle(farthest-side)") is "circle(farthest-side)"
</del><ins>+PASS getCSSText("-webkit-shape-inside", "circle(farthest-side)") is "circle(farthest-side at 50% 50%)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(farthest-side)") is "circle(farthest-side at 50% 50%)"
</span><del>-PASS getCSSText("-webkit-shape-inside", "circle(closest-side)") is "circle(closest-side)"
</del><ins>+PASS getCSSText("-webkit-shape-inside", "circle(closest-side)") is "circle(closest-side at 50% 50%)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(closest-side)") is "circle(closest-side at 50% 50%)"
</span><del>-PASS getCSSText("-webkit-shape-inside", "circle(10px)") is "circle(10px)"
</del><ins>+PASS getCSSText("-webkit-shape-inside", "circle(10px)") is "circle(10px at 50% 50%)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px)") is "circle(10px at 50% 50%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(10px at 10px)") is "circle(10px at 10px 50%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at 10px)") is "circle(10px at 10px 50%)"
</span><span class="lines">@@ -89,10 +89,14 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(at top left)") is "circle(closest-side at 0% 0%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(at right bottom)") is "circle(at 100% 100%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(at right bottom)") is "circle(closest-side at 100% 100%)"
</span><del>-PASS getCSSText("-webkit-shape-inside", "circle(10px at left top 10px)") is "circle(10px at left 0% top 10px)"
</del><ins>+PASS getCSSText("-webkit-shape-inside", "circle(10px at left top 10px)") is "circle(10px at 0% 10px)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at left top 10px)") is "circle(10px at 0% 10px)"
</span><del>-PASS getCSSText("-webkit-shape-inside", "circle(10px at top 10px left 10px)") is "circle(10px at left 10px top 10px)"
</del><ins>+PASS getCSSText("-webkit-shape-inside", "circle(10px at top 10px left 10px)") is "circle(10px at 10px 10px)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at top 10px left 10px)") is "circle(10px at 10px 10px)"
</span><ins>+PASS getCSSText("-webkit-shape-inside", "circle(10px at right 10% bottom 10%)") is "circle(10px at 90% 90%)"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at right 10% bottom 10%)") is "circle(10px at 90% 90%)"
+PASS getCSSText("-webkit-shape-inside", "circle(10px at right 0px bottom 0px)") is "circle(10px at 100% 100%)"
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at right 0px bottom 0px)") is "circle(10px at 100% 100%)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(10px at right 10px bottom 10px)") is "circle(10px at right 10px bottom 10px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(10px at right 10px bottom 10px)") is "circle(10px at right 10px bottom 10px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "ellipse(10px, 20px, 30px, 40px)") is "ellipse(10px, 20px, 30px, 40px)"
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt (164997 => 164998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-03-03 20:01:26 UTC (rev 164997)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-03-03 20:24:30 UTC (rev 164998)
</span><span class="lines">@@ -69,13 +69,13 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)") is "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(10px, 20px, 30px)") is "circle(10px, 20px, 30px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px, 20px, 30px)") is "circle(10px, 20px, 30px)"
</span><del>-PASS getCSSText("-webkit-shape-outside", "circle()") is "circle()"
</del><ins>+PASS getCSSText("-webkit-shape-outside", "circle()") is "circle(at 50% 50%)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle()") is "circle(closest-side at 50% 50%)"
</span><del>-PASS getCSSText("-webkit-shape-outside", "circle(farthest-side)") is "circle(farthest-side)"
</del><ins>+PASS getCSSText("-webkit-shape-outside", "circle(farthest-side)") is "circle(farthest-side at 50% 50%)"
</ins><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)"
</del><ins>+PASS getCSSText("-webkit-shape-outside", "circle(closest-side)") is "circle(closest-side at 50% 50%)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(closest-side)") is "circle(closest-side at 50% 50%)"
</span><del>-PASS getCSSText("-webkit-shape-outside", "circle(10px)") is "circle(10px)"
</del><ins>+PASS getCSSText("-webkit-shape-outside", "circle(10px)") is "circle(10px at 50% 50%)"
</ins><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="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px at 10px)") is "circle(10px at 10px 50%)"
</span><span class="lines">@@ -89,10 +89,14 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(at top left)") is "circle(closest-side at 0% 0%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(at right bottom)") is "circle(at 100% 100%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(at right bottom)") is "circle(closest-side at 100% 100%)"
</span><del>-PASS getCSSText("-webkit-shape-outside", "circle(10px at left top 10px)") is "circle(10px at left 0% top 10px)"
</del><ins>+PASS getCSSText("-webkit-shape-outside", "circle(10px at left top 10px)") is "circle(10px at 0% 10px)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px at left top 10px)") is "circle(10px at 0% 10px)"
</span><del>-PASS getCSSText("-webkit-shape-outside", "circle(10px at top 10px left 10px)") is "circle(10px at left 10px top 10px)"
</del><ins>+PASS getCSSText("-webkit-shape-outside", "circle(10px at top 10px left 10px)") is "circle(10px at 10px 10px)"
</ins><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px at top 10px left 10px)") is "circle(10px at 10px 10px)"
</span><ins>+PASS getCSSText("-webkit-shape-outside", "circle(10px at right 10% bottom 10%)") is "circle(10px at 90% 90%)"
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px at right 10% bottom 10%)") is "circle(10px at 90% 90%)"
+PASS getCSSText("-webkit-shape-outside", "circle(10px at right 0px bottom 0px)") is "circle(10px at 100% 100%)"
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(10px at right 0px bottom 0px)") is "circle(10px at 100% 100%)"
</ins><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(10px, 20px, 30px, 40px)") is "ellipse(10px, 20px, 30px, 40px)"
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingtestutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js (164997 => 164998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-03-03 20:01:26 UTC (rev 164997)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-03-03 20:24:30 UTC (rev 164998)
</span><span class="lines">@@ -42,18 +42,20 @@
</span><span class="cx">
</span><span class="cx"> "circle(10px, 20px, 30px)", // FIXME: Remove this test once we do not support the deprecated CSS Shapes syntax anymore.
</span><span class="cx">
</span><del>- ["circle()", "circle()", "circle(closest-side at 50% 50%)"],
- ["circle(farthest-side)", "circle(farthest-side)", "circle(farthest-side at 50% 50%)"],
- ["circle(closest-side)", "circle(closest-side)", "circle(closest-side at 50% 50%)"],
- ["circle(10px)", "circle(10px)", "circle(10px at 50% 50%)"],
</del><ins>+ ["circle()", "circle(at 50% 50%)", "circle(closest-side at 50% 50%)"],
+ ["circle(farthest-side)", "circle(farthest-side at 50% 50%)", "circle(farthest-side at 50% 50%)"],
+ ["circle(closest-side)", "circle(closest-side at 50% 50%)", "circle(closest-side at 50% 50%)"],
+ ["circle(10px)", "circle(10px at 50% 50%)", "circle(10px at 50% 50%)"],
</ins><span class="cx"> ["circle(10px at 10px)", "circle(10px at 10px 50%)"],
</span><span class="cx"> "circle(10px at 10px 10px)",
</span><span class="cx"> ["circle(at 10px)", "circle(at 10px 50%)", "circle(closest-side at 10px 50%)"],
</span><span class="cx"> ["circle(at 10px 10px)", "circle(at 10px 10px)", "circle(closest-side at 10px 10px)"],
</span><span class="cx"> ["circle(at top left)", "circle(at 0% 0%)", "circle(closest-side at 0% 0%)"],
</span><span class="cx"> ["circle(at right bottom)", "circle(at 100% 100%)", "circle(closest-side at 100% 100%)"],
</span><del>- ["circle(10px at left top 10px)", "circle(10px at left 0% top 10px)", "circle(10px at 0% 10px)"],
- ["circle(10px at top 10px left 10px)", "circle(10px at left 10px top 10px)", "circle(10px at 10px 10px)"],
</del><ins>+ ["circle(10px at left top 10px)", "circle(10px at 0% 10px)", "circle(10px at 0% 10px)"],
+ ["circle(10px at top 10px left 10px)", "circle(10px at 10px 10px)", "circle(10px at 10px 10px)"],
+ ["circle(10px at right 10% bottom 10%)", "circle(10px at 90% 90%)"],
+ ["circle(10px at right 0px bottom 0px)", "circle(10px at 100% 100%)"],
</ins><span class="cx"> ["circle(10px at right 10px bottom 10px)", "circle(10px at right 10px bottom 10px)"],
</span><span class="cx">
</span><span class="cx"> "ellipse(10px, 20px, 30px, 40px)", // FIXME: Remove this test once we do not support the deprecated CSS Shapes syntax anymore.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164997 => 164998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-03 20:01:26 UTC (rev 164997)
+++ trunk/Source/WebCore/ChangeLog 2014-03-03 20:24:30 UTC (rev 164998)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-03-03 Bear Travis <betravis@adobe.com>
+
+ [CSS Shapes] Serialize circle positions
+ https://bugs.webkit.org/show_bug.cgi?id=129404
+
+ Reviewed by Dirk Schulze.
+
+ Circle positions should always be present when serialized, and should
+ only have the 2 or 4-valued form. Keywords are converted to percentages
+ and simplified where possible. This patch adds some additional processing
+ that converts the parsed position into the serialized format, before
+ converting it to text. See http://dev.w3.org/csswg/css-shapes/#basic-shape-serialization.
+
+ Updated existing parsing tests.
+
+ * css/CSSBasicShapes.cpp:
+ (WebCore::serializePositionOffset): Convert a position offset to a serialized string.
+ The offset must be a pair, as generated by buildSerializablePositionOffset.
+ (WebCore::buildSerializablePositionOffset): Generates a keyword + offset pair for each
+ position offset. The keywords may later be dropped during serialization.
+ (WebCore::CSSBasicShapeCircle::cssText): Use the new serialization methods.
+
</ins><span class="cx"> 2014-03-03 Lorenzo Tilve <ltilve@igalia.com>
</span><span class="cx">
</span><span class="cx"> Optimize StylePropertiesSet::findPropertyIndex() to improve CSS properties performance
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.cpp (164997 => 164998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-03-03 20:01:26 UTC (rev 164997)
+++ trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-03-03 20:24:30 UTC (rev 164998)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "CSSBasicShapes.h"
</span><span class="cx">
</span><span class="cx"> #include "CSSPrimitiveValueMappings.h"
</span><ins>+#include "CSSValuePool.h"
</ins><span class="cx"> #include "Pair.h"
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="lines">@@ -96,6 +97,47 @@
</span><span class="cx"> && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static String serializePositionOffset(const Pair& offset, const Pair& other)
+{
+ if ((offset.first()->getValueID() == CSSValueLeft && other.first()->getValueID() == CSSValueTop)
+ || (offset.first()->getValueID() == CSSValueTop && other.first()->getValueID() == CSSValueLeft))
+ return offset.second()->cssText();
+ return offset.cssText();
+}
+
+static PassRefPtr<CSSPrimitiveValue> buildSerializablePositionOffset(PassRefPtr<CSSPrimitiveValue> offset, CSSValueID defaultSide)
+{
+ CSSValueID side = defaultSide;
+ RefPtr<CSSPrimitiveValue> amount;
+
+ if (!offset)
+ side = CSSValueCenter;
+ else if (offset->isValueID())
+ side = offset->getValueID();
+ else if (Pair* pair = offset->getPairValue()) {
+ side = pair->first()->getValueID();
+ amount = pair->second();
+ } else
+ amount = offset;
+
+ if (side == CSSValueCenter) {
+ side = defaultSide;
+ amount = cssValuePool().createValue(Length(50, Percent));
+ } else if ((side == CSSValueRight || side == CSSValueBottom)
+ && amount->isPercentage()) {
+ side = defaultSide;
+ amount = cssValuePool().createValue(Length(100 - amount->getFloatValue(), Percent));
+ } else if (amount->isLength() && !amount->getFloatValue()) {
+ if (side == CSSValueRight || side == CSSValueBottom)
+ amount = cssValuePool().createValue(Length(100, Percent));
+ else
+ amount = cssValuePool().createValue(Length(0, Percent));
+ side = defaultSide;
+ }
+
+ return cssValuePool().createValue(Pair::create(cssValuePool().createValue(side), amount.release()));
+}
+
</ins><span class="cx"> static String buildCircleString(const String& radius, const String& centerX, const String& centerY, const String& box)
</span><span class="cx"> {
</span><span class="cx"> char opening[] = "circle(";
</span><span class="lines">@@ -125,9 +167,12 @@
</span><span class="cx">
</span><span class="cx"> String CSSBasicShapeCircle::cssText() const
</span><span class="cx"> {
</span><ins>+ RefPtr<CSSPrimitiveValue> normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft);
+ RefPtr<CSSPrimitiveValue> normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop);
+
</ins><span class="cx"> return buildCircleString(m_radius ? m_radius->cssText() : String(),
</span><del>- m_centerX ? m_centerX->cssText() : String(),
- m_centerY ? m_centerY->cssText() : String(),
</del><ins>+ serializePositionOffset(*normalizedCX->getPairValue(), *normalizedCY->getPairValue()),
+ serializePositionOffset(*normalizedCY->getPairValue(), *normalizedCX->getPairValue()),
</ins><span class="cx"> m_layoutBox ? m_layoutBox->cssText() : String());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>