<!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>[162848] 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/162848">162848</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-27 11:15:25 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] inset() function with multiple spaces on element style
https://bugs.webkit.org/show_bug.cgi?id=127617
Reviewed by Dirk Schulze.
Source/WebCore:
When only a subset of parameters were defined for an inset shape, the built
inset string contained some extra spaces. This patch fixes the behavior and
adds tests for the case. I also removed the string allocation optimization from
buildInsetString, since it's not worthwhile to always allocate as many memory
as needed for a fully defined inset.
I added the new test cases to the shapes parser code test.
* css/CSSBasicShapes.cpp:
(WebCore::buildInsetString):
LayoutTests:
* fast/shapes/parsing/parsing-shape-inside-expected.txt:
* 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="#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 (162847 => 162848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-27 19:08:51 UTC (rev 162847)
+++ trunk/LayoutTests/ChangeLog 2014-01-27 19:15:25 UTC (rev 162848)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-27 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] inset() function with multiple spaces on element style
+ https://bugs.webkit.org/show_bug.cgi?id=127617
+
+ Reviewed by Dirk Schulze.
+
+ * fast/shapes/parsing/parsing-shape-inside-expected.txt:
+ * fast/shapes/parsing/parsing-shape-outside-expected.txt:
+ * fast/shapes/parsing/parsing-test-utils.js:
+
</ins><span class="cx"> 2014-01-27 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Typo fix after r162838.
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeinsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt (162847 => 162848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-01-27 19:08:51 UTC (rev 162847)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-01-27 19:15:25 UTC (rev 162848)
</span><span class="lines">@@ -17,8 +17,52 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 5px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px, 5px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
</span><ins>+PASS getCSSText("-webkit-shape-inside", "inset(10px)") is "inset(10px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px)") is "inset(10px 0px 0px 0px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px 9px)") is "inset(10px 9px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 9px)") is "inset(10px 9px 0px 0px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px 9px 8px)") is "inset(10px 9px 8px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 9px 8px)") is "inset(10px 9px 8px 0px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset(10px 20px 30px 40px)") is "inset(10px 20px 30px 40px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 20px 30px 40px)") is "inset(10px 20px 30px 40px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
</span><ins>+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px)") is "inset(10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px)") is "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 9px)") is "inset(10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px / 9px)") is "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 8px)") is "inset(10px round 9px 9px 9px 9px / 8px 8px 8px 8px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px / 8px)") is "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 8px 8px 8px 8px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 8px 7px)") is "inset(10px round 9px 9px 9px 9px / 8px 7px 8px 7px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px / 8px 7px)") is "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 8px 7px 8px 7px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 8px 7px 6px)") is "inset(10px round 9px 9px 9px 9px / 8px 7px 6px 7px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px / 8px 7px 6px)") is "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 8px 7px 6px 7px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 8px 7px 6px 5px)") is "inset(10px round 9px 9px 9px 9px / 8px 7px 6px 5px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px / 8px 7px 6px 5px)") is "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 8px 7px 6px 5px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px / 7px)") is "inset(10px round 9px 8px 9px 8px / 7px 7px 7px 7px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px / 7px)") is "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 7px 7px 7px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px 5px)") is "inset(10px round 9px 8px 9px 8px / 7px 6px 5px 6px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px 5px)") is "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 6px 5px 6px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px 5px 4px)") is "inset(10px round 9px 8px 9px 8px / 7px 6px 5px 4px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px 5px 4px)") is "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 6px 5px 4px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px)") is "inset(10px round 9px 8px 7px 8px / 6px 6px 6px 6px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 8px / 6px 6px 6px 6px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px 5px)") is "inset(10px round 9px 8px 7px 8px / 6px 5px 6px 5px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px 5px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 8px / 6px 5px 6px 5px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px 5px 4px)") is "inset(10px round 9px 8px 7px 8px / 6px 5px 4px 5px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px 5px 4px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 8px / 6px 5px 4px 5px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px 5px 4px 3px)") is "inset(10px round 9px 8px 7px 8px / 6px 5px 4px 3px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px 5px 4px 3px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 8px / 6px 5px 4px 3px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px)") is "inset(10px round 9px 8px 7px 6px / 5px 5px 5px 5px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 6px / 5px 5px 5px 5px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px 4px)") is "inset(10px round 9px 8px 7px 6px / 5px 4px 5px 4px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px 4px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 6px / 5px 4px 5px 4px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px)") is "inset(10px round 9px 8px 7px 6px / 5px 4px 3px 4px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 6px / 5px 4px 3px 4px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px 2px)") is "inset(10px round 9px 8px 7px 6px / 5px 4px 3px 2px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px 2px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 6px / 5px 4px 3px 2px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "inset(10px 20px 30px 40px round 5px 6px)") is "inset(10px 20px 30px 40px round 5px 6px 5px 6px / 5px 6px 5px 6px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 20px 30px 40px round 5px 6px)") is "inset(10px 20px 30px 40px round 5px 6px 5px 6px / 5px 6px 5px 6px)"
</span><span class="cx"> PASS getCSSText("-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></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt (162847 => 162848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-01-27 19:08:51 UTC (rev 162847)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-01-27 19:15:25 UTC (rev 162848)
</span><span class="lines">@@ -17,8 +17,52 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset-rectangle(10px, 20px, 30px, 40px, 5px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px, 5px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)") is "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)"
</span><ins>+PASS getCSSText("-webkit-shape-outside", "inset(10px)") is "inset(10px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px)") is "inset(10px 0px 0px 0px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px 9px)") is "inset(10px 9px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px 9px)") is "inset(10px 9px 0px 0px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px 9px 8px)") is "inset(10px 9px 8px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px 9px 8px)") is "inset(10px 9px 8px 0px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "inset(10px 20px 30px 40px)") is "inset(10px 20px 30px 40px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px 20px 30px 40px)") is "inset(10px 20px 30px 40px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
</span><ins>+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px)") is "inset(10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px)") is "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px / 9px)") is "inset(10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px / 9px)") is "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px / 8px)") is "inset(10px round 9px 9px 9px 9px / 8px 8px 8px 8px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px / 8px)") is "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 8px 8px 8px 8px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px / 8px 7px)") is "inset(10px round 9px 9px 9px 9px / 8px 7px 8px 7px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px / 8px 7px)") is "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 8px 7px 8px 7px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px / 8px 7px 6px)") is "inset(10px round 9px 9px 9px 9px / 8px 7px 6px 7px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px / 8px 7px 6px)") is "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 8px 7px 6px 7px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px / 8px 7px 6px 5px)") is "inset(10px round 9px 9px 9px 9px / 8px 7px 6px 5px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px / 8px 7px 6px 5px)") is "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 8px 7px 6px 5px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px / 7px)") is "inset(10px round 9px 8px 9px 8px / 7px 7px 7px 7px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px / 7px)") is "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 7px 7px 7px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px / 7px 6px 5px)") is "inset(10px round 9px 8px 9px 8px / 7px 6px 5px 6px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px / 7px 6px 5px)") is "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 6px 5px 6px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px / 7px 6px 5px 4px)") is "inset(10px round 9px 8px 9px 8px / 7px 6px 5px 4px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px / 7px 6px 5px 4px)") is "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 6px 5px 4px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px 7px / 6px)") is "inset(10px round 9px 8px 7px 8px / 6px 6px 6px 6px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px 7px / 6px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 8px / 6px 6px 6px 6px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px 7px / 6px 5px)") is "inset(10px round 9px 8px 7px 8px / 6px 5px 6px 5px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px 7px / 6px 5px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 8px / 6px 5px 6px 5px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px 7px / 6px 5px 4px)") is "inset(10px round 9px 8px 7px 8px / 6px 5px 4px 5px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px 7px / 6px 5px 4px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 8px / 6px 5px 4px 5px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px 7px / 6px 5px 4px 3px)") is "inset(10px round 9px 8px 7px 8px / 6px 5px 4px 3px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px 7px / 6px 5px 4px 3px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 8px / 6px 5px 4px 3px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px 7px 6px / 5px)") is "inset(10px round 9px 8px 7px 6px / 5px 5px 5px 5px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px 7px 6px / 5px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 6px / 5px 5px 5px 5px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px 7px 6px / 5px 4px)") is "inset(10px round 9px 8px 7px 6px / 5px 4px 5px 4px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px 7px 6px / 5px 4px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 6px / 5px 4px 5px 4px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px)") is "inset(10px round 9px 8px 7px 6px / 5px 4px 3px 4px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 6px / 5px 4px 3px 4px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px 2px)") is "inset(10px round 9px 8px 7px 6px / 5px 4px 3px 2px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px 2px)") is "inset(10px 0px 0px 0px round 9px 8px 7px 6px / 5px 4px 3px 2px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "inset(10px 20px 30px 40px round 5px 6px)") is "inset(10px 20px 30px 40px round 5px 6px 5px 6px / 5px 6px 5px 6px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px 20px 30px 40px round 5px 6px)") is "inset(10px 20px 30px 40px round 5px 6px 5px 6px / 5px 6px 5px 6px)"
</span><span class="cx"> PASS getCSSText("-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></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingtestutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js (162847 => 162848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-01-27 19:08:51 UTC (rev 162847)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-01-27 19:15:25 UTC (rev 162848)
</span><span class="lines">@@ -14,7 +14,29 @@
</span><span class="cx"> ["inset-rectangle(10px, 20px, 30px, 40px, 5px)", "inset-rectangle(10px, 20px, 30px, 40px, 5px)", "inset-rectangle(10px, 20px, 30px, 40px, 5px, 5px)"],
</span><span class="cx"> "inset-rectangle(10px, 20px, 30px, 40px, 5px, 10px)",
</span><span class="cx">
</span><ins>+ ["inset(10px)", "inset(10px)", "inset(10px 0px 0px 0px round 0px 0px 0px 0px / 0px 0px 0px 0px)"],
+ ["inset(10px 9px)", "inset(10px 9px)", "inset(10px 9px 0px 0px round 0px 0px 0px 0px / 0px 0px 0px 0px)"],
+ ["inset(10px 9px 8px)", "inset(10px 9px 8px)", "inset(10px 9px 8px 0px round 0px 0px 0px 0px / 0px 0px 0px 0px)"],
</ins><span class="cx"> ["inset(10px 20px 30px 40px)", "inset(10px 20px 30px 40px)", "inset(10px 20px 30px 40px round 0px 0px 0px 0px / 0px 0px 0px 0px)"],
</span><ins>+ ["inset(10px round 9px)", "inset(10px round 9px 9px 9px 9px / 9px 9px 9px 9px)", "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 9px 9px 9px 9px)"],
+ ["inset(10px round 9px / 9px)", "inset(10px round 9px 9px 9px 9px / 9px 9px 9px 9px)", "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 9px 9px 9px 9px)"],
+ ["inset(10px round 9px / 8px)", "inset(10px round 9px 9px 9px 9px / 8px 8px 8px 8px)", "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 8px 8px 8px 8px)"],
+ ["inset(10px round 9px / 8px 7px)", "inset(10px round 9px 9px 9px 9px / 8px 7px 8px 7px)", "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 8px 7px 8px 7px)"],
+ ["inset(10px round 9px / 8px 7px 6px)", "inset(10px round 9px 9px 9px 9px / 8px 7px 6px 7px)", "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 8px 7px 6px 7px)"],
+ ["inset(10px round 9px / 8px 7px 6px 5px)", "inset(10px round 9px 9px 9px 9px / 8px 7px 6px 5px)", "inset(10px 0px 0px 0px round 9px 9px 9px 9px / 8px 7px 6px 5px)"],
+ ["inset(10px round 9px 8px / 7px)", "inset(10px round 9px 8px 9px 8px / 7px 7px 7px 7px)", "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 7px 7px 7px)"],
+ ["inset(10px round 9px 8px / 7px 6px)", "inset(10px round 9px 8px 9px 8px / 7px 6px 7px 6px)", "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 6px 7px 6px)"],
+ ["inset(10px round 9px 8px / 7px 6px)", "inset(10px round 9px 8px 9px 8px / 7px 6px 7px 6px)", "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 6px 7px 6px)"],
+ ["inset(10px round 9px 8px / 7px 6px 5px)", "inset(10px round 9px 8px 9px 8px / 7px 6px 5px 6px)", "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 6px 5px 6px)"],
+ ["inset(10px round 9px 8px / 7px 6px 5px 4px)", "inset(10px round 9px 8px 9px 8px / 7px 6px 5px 4px)", "inset(10px 0px 0px 0px round 9px 8px 9px 8px / 7px 6px 5px 4px)"],
+ ["inset(10px round 9px 8px 7px / 6px)", "inset(10px round 9px 8px 7px 8px / 6px 6px 6px 6px)", "inset(10px 0px 0px 0px round 9px 8px 7px 8px / 6px 6px 6px 6px)"],
+ ["inset(10px round 9px 8px 7px / 6px 5px)", "inset(10px round 9px 8px 7px 8px / 6px 5px 6px 5px)", "inset(10px 0px 0px 0px round 9px 8px 7px 8px / 6px 5px 6px 5px)"],
+ ["inset(10px round 9px 8px 7px / 6px 5px 4px)", "inset(10px round 9px 8px 7px 8px / 6px 5px 4px 5px)", "inset(10px 0px 0px 0px round 9px 8px 7px 8px / 6px 5px 4px 5px)"],
+ ["inset(10px round 9px 8px 7px / 6px 5px 4px 3px)", "inset(10px round 9px 8px 7px 8px / 6px 5px 4px 3px)", "inset(10px 0px 0px 0px round 9px 8px 7px 8px / 6px 5px 4px 3px)"],
+ ["inset(10px round 9px 8px 7px 6px / 5px)", "inset(10px round 9px 8px 7px 6px / 5px 5px 5px 5px)", "inset(10px 0px 0px 0px round 9px 8px 7px 6px / 5px 5px 5px 5px)"],
+ ["inset(10px round 9px 8px 7px 6px / 5px 4px)", "inset(10px round 9px 8px 7px 6px / 5px 4px 5px 4px)", "inset(10px 0px 0px 0px round 9px 8px 7px 6px / 5px 4px 5px 4px)"],
+ ["inset(10px round 9px 8px 7px 6px / 5px 4px 3px)", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px 4px)", "inset(10px 0px 0px 0px round 9px 8px 7px 6px / 5px 4px 3px 4px)"],
+ ["inset(10px round 9px 8px 7px 6px / 5px 4px 3px 2px)", "inset(10px round 9px 8px 7px 6px / 5px 4px 3px 2px)", "inset(10px 0px 0px 0px round 9px 8px 7px 6px / 5px 4px 3px 2px)"],
</ins><span class="cx"> ["inset(10px 20px 30px 40px round 5px 6px)", "inset(10px 20px 30px 40px round 5px 6px 5px 6px / 5px 6px 5px 6px)", "inset(10px 20px 30px 40px round 5px 6px 5px 6px / 5px 6px 5px 6px)"],
</span><span class="cx"> "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)",
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162847 => 162848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-27 19:08:51 UTC (rev 162847)
+++ trunk/Source/WebCore/ChangeLog 2014-01-27 19:15:25 UTC (rev 162848)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-27 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] inset() function with multiple spaces on element style
+ https://bugs.webkit.org/show_bug.cgi?id=127617
+
+ Reviewed by Dirk Schulze.
+
+ When only a subset of parameters were defined for an inset shape, the built
+ inset string contained some extra spaces. This patch fixes the behavior and
+ adds tests for the case. I also removed the string allocation optimization from
+ buildInsetString, since it's not worthwhile to always allocate as many memory
+ as needed for a fully defined inset.
+
+ I added the new test cases to the shapes parser code test.
+
+ * css/CSSBasicShapes.cpp:
+ (WebCore::buildInsetString):
+
</ins><span class="cx"> 2014-01-27 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> * WebCore.exp.in: Add export needed for iOS.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.cpp (162847 => 162848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-01-27 19:08:51 UTC (rev 162847)
+++ trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-01-27 19:15:25 UTC (rev 162848)
</span><span class="lines">@@ -411,22 +411,21 @@
</span><span class="cx"> char opening[] = "inset(";
</span><span class="cx"> char separator[] = " ";
</span><span class="cx"> char cornersSeparator[] = "round";
</span><del>- char radiusSeparator[] = "/";
</del><span class="cx"> StringBuilder result;
</span><del>- // Compute the required capacity in advance to reduce allocations.
- result.reserveCapacity((sizeof(opening) - 1) + (13 * (sizeof(separator) - 1)) + (sizeof(cornersSeparator) - 1) + (sizeof(radiusSeparator) - 1) + 1
- + top.length() + right.length() + bottom.length() + left.length()
- + topLeftRadiusWidth.length() + topRightRadiusWidth.length() + bottomRightRadiusWidth.length() + bottomLeftRadiusWidth.length() +
- + topLeftRadiusHeight.length() + topRightRadiusHeight.length() + bottomRightRadiusHeight.length() + bottomLeftRadiusHeight.length() +
- + (box.length() ? box.length() + 1 : 0));
</del><span class="cx"> result.appendLiteral(opening);
</span><span class="cx"> result.append(top);
</span><del>- result.appendLiteral(separator);
- result.append(right);
- result.appendLiteral(separator);
- result.append(bottom);
- result.appendLiteral(separator);
- result.append(left);
</del><ins>+ if (!right.isNull()) {
+ result.appendLiteral(separator);
+ result.append(right);
+ }
+ if (!bottom.isNull()) {
+ result.appendLiteral(separator);
+ result.append(bottom);
+ }
+ if (!left.isNull()) {
+ result.appendLiteral(separator);
+ result.append(left);
+ }
</ins><span class="cx">
</span><span class="cx"> if (!topLeftRadiusWidth.isNull() && !topLeftRadiusHeight.isNull()) {
</span><span class="cx"> result.appendLiteral(separator);
</span><span class="lines">@@ -442,7 +441,7 @@
</span><span class="cx"> result.append(bottomLeftRadiusWidth);
</span><span class="cx">
</span><span class="cx"> result.appendLiteral(separator);
</span><del>- result.append(radiusSeparator);
</del><ins>+ result.append('/');
</ins><span class="cx"> result.appendLiteral(separator);
</span><span class="cx">
</span><span class="cx"> result.append(topLeftRadiusHeight);
</span></span></pre>
</div>
</div>
</body>
</html>