<!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>[162989] 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/162989">162989</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-28 17:22:16 -0800 (Tue, 28 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Adjust inset sizing syntax to the latest specification
https://bugs.webkit.org/show_bug.cgi?id=127785
Reviewed by Bem Jones-Bey.
Source/WebCore:
According to the latest CSS Shapes specification [1], the width arguments of inset should
follow the syntax of the margin shorthand, which let us set all four insets with one, two
or four values. This patch updates the behavior and updates the affected tests.
[1] http://dev.w3.org/csswg/css-shapes/#funcdef-inset
Existing tests have been updated.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseInsetRoundedCorners):
(WebCore::CSSParser::parseBasicShapeInset):
LayoutTests:
* fast/shapes/parsing/parsing-shape-inside-expected.txt:
* fast/shapes/parsing/parsing-shape-outside-expected.txt:
* fast/shapes/parsing/parsing-test-utils.js:
* fast/shapes/shape-outside-floats/shape-outside-floats-inset.html:</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="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsinsethtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-inset.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162988 => 162989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-29 01:19:50 UTC (rev 162988)
+++ trunk/LayoutTests/ChangeLog 2014-01-29 01:22:16 UTC (rev 162989)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-28 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Adjust inset sizing syntax to the latest specification
+ https://bugs.webkit.org/show_bug.cgi?id=127785
+
+ Reviewed by Bem Jones-Bey.
+
+ * fast/shapes/parsing/parsing-shape-inside-expected.txt:
+ * fast/shapes/parsing/parsing-shape-outside-expected.txt:
+ * fast/shapes/parsing/parsing-test-utils.js:
+ * fast/shapes/shape-outside-floats/shape-outside-floats-inset.html:
+
</ins><span class="cx"> 2014-01-28 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Make DOM attributes appear to be faux accessor properties
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeinsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt (162988 => 162989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-01-29 01:19:50 UTC (rev 162988)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-01-29 01:22:16 UTC (rev 162989)
</span><span class="lines">@@ -17,52 +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><del>-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)"
</del><ins>+PASS getCSSText("-webkit-shape-inside", "inset(10px)") is "inset(10px 10px 10px 10px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px)") is "inset(10px 10px 10px 10px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px 9px)") is "inset(10px 9px 10px 9px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 9px)") is "inset(10px 9px 10px 9px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px 9px 8px)") is "inset(10px 9px 8px 9px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px 9px 8px)") is "inset(10px 9px 8px 9px 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><del>-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)"
</del><ins>+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 9px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px / 9px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 8px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 8px 8px 8px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px / 8px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 8px 8px 8px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 8px 7px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 8px 7px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px / 8px 7px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 8px 7px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px / 8px 7px 6px)") is "inset(10px 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 6px 5px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px / 7px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 7px 7px 7px)"
+PASS getComputedStyleValue("-webkit-shape-inside", "inset(10px round 9px 8px / 7px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 7px 7px 7px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px 10px 10px 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 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 5px 4px)"
+PASS getCSSText("-webkit-shape-inside", "inset(10px round 9px 8px 7px / 6px)") is "inset(10px 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 (162988 => 162989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-01-29 01:19:50 UTC (rev 162988)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-01-29 01:22:16 UTC (rev 162989)
</span><span class="lines">@@ -17,52 +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><del>-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)"
</del><ins>+PASS getCSSText("-webkit-shape-outside", "inset(10px)") is "inset(10px 10px 10px 10px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px)") is "inset(10px 10px 10px 10px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px 9px)") is "inset(10px 9px 10px 9px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px 9px)") is "inset(10px 9px 10px 9px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px 9px 8px)") is "inset(10px 9px 8px 9px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px 9px 8px)") is "inset(10px 9px 8px 9px 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><del>-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)"
</del><ins>+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px / 9px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px / 9px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px / 8px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 8px 8px 8px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px / 8px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 8px 8px 8px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px / 8px 7px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 8px 7px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px / 8px 7px)") is "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 8px 7px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px / 8px 7px 6px)") is "inset(10px 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 6px 5px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px / 7px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 7px 7px 7px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 9px 8px / 7px)") is "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 7px 7px 7px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px 10px 10px 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 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 7px 6px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px / 7px 6px)") is "inset(10px 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 5px 4px)"
+PASS getCSSText("-webkit-shape-outside", "inset(10px round 9px 8px 7px / 6px)") is "inset(10px 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 10px 10px 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 10px 10px 10px 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 (162988 => 162989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-01-29 01:19:50 UTC (rev 162988)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-01-29 01:22:16 UTC (rev 162989)
</span><span class="lines">@@ -14,29 +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><del>- ["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)"],
</del><ins>+ ["inset(10px)", "inset(10px 10px 10px 10px)", "inset(10px 10px 10px 10px round 0px 0px 0px 0px / 0px 0px 0px 0px)"],
+ ["inset(10px 9px)", "inset(10px 9px 10px 9px)", "inset(10px 9px 10px 9px round 0px 0px 0px 0px / 0px 0px 0px 0px)"],
+ ["inset(10px 9px 8px)", "inset(10px 9px 8px 9px)", "inset(10px 9px 8px 9px 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><del>- ["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)"],
</del><ins>+ ["inset(10px round 9px)", "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)", "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"],
+ ["inset(10px round 9px / 9px)", "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)", "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 9px 9px 9px 9px)"],
+ ["inset(10px round 9px / 8px)", "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 8px 8px 8px)", "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 8px 8px 8px)"],
+ ["inset(10px round 9px / 8px 7px)", "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 8px 7px)", "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 8px 7px)"],
+ ["inset(10px round 9px / 8px 7px 6px)", "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 6px 7px)", "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 6px 7px)"],
+ ["inset(10px round 9px / 8px 7px 6px 5px)", "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 6px 5px)", "inset(10px 10px 10px 10px round 9px 9px 9px 9px / 8px 7px 6px 5px)"],
+ ["inset(10px round 9px 8px / 7px)", "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 7px 7px 7px)", "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 7px 7px 7px)"],
+ ["inset(10px round 9px 8px / 7px 6px)", "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 7px 6px)", "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 7px 6px)"],
+ ["inset(10px round 9px 8px / 7px 6px)", "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 7px 6px)", "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 7px 6px)"],
+ ["inset(10px round 9px 8px / 7px 6px 5px)", "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 5px 6px)", "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 5px 6px)"],
+ ["inset(10px round 9px 8px / 7px 6px 5px 4px)", "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 5px 4px)", "inset(10px 10px 10px 10px round 9px 8px 9px 8px / 7px 6px 5px 4px)"],
+ ["inset(10px round 9px 8px 7px / 6px)", "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 6px 6px 6px)", "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 6px 6px 6px)"],
+ ["inset(10px round 9px 8px 7px / 6px 5px)", "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 5px 6px 5px)", "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 5px 6px 5px)"],
+ ["inset(10px round 9px 8px 7px / 6px 5px 4px)", "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 5px 4px 5px)", "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 5px 4px 5px)"],
+ ["inset(10px round 9px 8px 7px / 6px 5px 4px 3px)", "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 5px 4px 3px)", "inset(10px 10px 10px 10px round 9px 8px 7px 8px / 6px 5px 4px 3px)"],
+ ["inset(10px round 9px 8px 7px 6px / 5px)", "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 5px 5px 5px)", "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 5px 5px 5px)"],
+ ["inset(10px round 9px 8px 7px 6px / 5px 4px)", "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 4px 5px 4px)", "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 4px 5px 4px)"],
+ ["inset(10px round 9px 8px 7px 6px / 5px 4px 3px)", "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 4px 3px 4px)", "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 4px 3px 4px)"],
+ ["inset(10px round 9px 8px 7px 6px / 5px 4px 3px 2px)", "inset(10px 10px 10px 10px round 9px 8px 7px 6px / 5px 4px 3px 2px)", "inset(10px 10px 10px 10px 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="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatsinsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-inset.html (162988 => 162989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-inset.html 2014-01-29 01:19:50 UTC (rev 162988)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-inset.html 2014-01-29 01:22:16 UTC (rev 162989)
</span><span class="lines">@@ -17,13 +17,13 @@
</span><span class="cx"> height: 40px;
</span><span class="cx"> }
</span><span class="cx"> .top {
</span><del>- -webkit-shape-outside: inset(20px);
</del><ins>+ -webkit-shape-outside: inset(20px 0 0 0);
</ins><span class="cx"> }
</span><span class="cx"> .right {
</span><del>- -webkit-shape-outside: inset(0 20px);
</del><ins>+ -webkit-shape-outside: inset(0 20px 0 0);
</ins><span class="cx"> }
</span><span class="cx"> .bottom {
</span><del>- -webkit-shape-outside: inset(0 0 20px);
</del><ins>+ -webkit-shape-outside: inset(0 0 20px 0);
</ins><span class="cx"> }
</span><span class="cx"> .left {
</span><span class="cx"> -webkit-shape-outside: inset(0 0 0 20px);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162988 => 162989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-29 01:19:50 UTC (rev 162988)
+++ trunk/Source/WebCore/ChangeLog 2014-01-29 01:22:16 UTC (rev 162989)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-01-28 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Adjust inset sizing syntax to the latest specification
+ https://bugs.webkit.org/show_bug.cgi?id=127785
+
+ Reviewed by Bem Jones-Bey.
+
+ According to the latest CSS Shapes specification [1], the width arguments of inset should
+ follow the syntax of the margin shorthand, which let us set all four insets with one, two
+ or four values. This patch updates the behavior and updates the affected tests.
+
+ [1] http://dev.w3.org/csswg/css-shapes/#funcdef-inset
+
+ Existing tests have been updated.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseInsetRoundedCorners):
+ (WebCore::CSSParser::parseBasicShapeInset):
+
</ins><span class="cx"> 2014-01-28 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Make DOM attributes appear to be faux accessor properties
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (162988 => 162989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-01-29 01:19:50 UTC (rev 162988)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-01-29 01:22:16 UTC (rev 162989)
</span><span class="lines">@@ -5323,6 +5323,9 @@
</span><span class="cx"> {
</span><span class="cx"> CSSParserValue* argument = args->next();
</span><span class="cx">
</span><ins>+ if (!argument)
+ return nullptr;
+
</ins><span class="cx"> std::unique_ptr<CSSParserValueList> radiusArguments(new CSSParserValueList);
</span><span class="cx"> while (argument) {
</span><span class="cx"> radiusArguments->addValue(*argument);
</span><span class="lines">@@ -5385,41 +5388,58 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSBasicShapeInset> shape = CSSBasicShapeInset::create();
</span><span class="cx">
</span><del>- unsigned argumentNumber = 0;
</del><span class="cx"> CSSParserValue* argument = args->current();
</span><ins>+ Vector<RefPtr<CSSPrimitiveValue> > widthArguments;
+ bool hasRoundedInset = false;
</ins><span class="cx"> while (argument) {
</span><del>- if (argument->unit == CSSPrimitiveValue::CSS_IDENT) {
- if (argumentNumber > 0 && equalIgnoringCase(argument->string, "round"))
- return parseInsetRoundedCorners(shape.release(), args);
- return nullptr;
</del><ins>+ if (argument->unit == CSSPrimitiveValue::CSS_IDENT && equalIgnoringCase(argument->string, "round")) {
+ hasRoundedInset = true;
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Units unitFlags = FLength | FPercent;
</span><del>- if (!validUnit(argument, unitFlags) || argumentNumber > 3)
</del><ins>+ if (!validUnit(argument, unitFlags) || widthArguments.size() > 4)
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RefPtr<CSSPrimitiveValue> length = createPrimitiveNumericValue(argument);
- switch (argumentNumber) {
- case 0:
- shape->setTop(length);
- break;
- case 1:
- shape->setRight(length);
- break;
- case 2:
- shape->setBottom(length);
- break;
- case 3:
- shape->setLeft(length);
- break;
- }
</del><ins>+ widthArguments.append(createPrimitiveNumericValue(argument));
</ins><span class="cx"> argument = args->next();
</span><del>- argumentNumber++;
</del><span class="cx"> }
</span><span class="cx">
</span><del>- if (!argumentNumber)
</del><ins>+ switch (widthArguments.size()) {
+ case 1: {
+ shape->setTop(widthArguments[0]);
+ shape->setRight(widthArguments[0]);
+ shape->setBottom(widthArguments[0]);
+ shape->setLeft(widthArguments[0]);
+ break;
+ }
+ case 2: {
+ shape->setTop(widthArguments[0]);
+ shape->setRight(widthArguments[1]);
+ shape->setBottom(widthArguments[0]);
+ shape->setLeft(widthArguments[1]);
+ break;
+ }
+ case 3: {
+ shape->setTop(widthArguments[0]);
+ shape->setRight(widthArguments[1]);
+ shape->setBottom(widthArguments[2]);
+ shape->setLeft(widthArguments[1]);
+ break;
+ }
+ case 4: {
+ shape->setTop(widthArguments[0]);
+ shape->setRight(widthArguments[1]);
+ shape->setBottom(widthArguments[2]);
+ shape->setLeft(widthArguments[3]);
+ break;
+ }
+ default:
</ins><span class="cx"> return nullptr;
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ if (hasRoundedInset)
+ return parseInsetRoundedCorners(shape, args);
</ins><span class="cx"> return shape;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>