<!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>[165655] 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/165655">165655</a></dd>
<dt>Author</dt> <dd>betravis@adobe.com</dd>
<dt>Date</dt> <dd>2014-03-14 14:58:35 -0700 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] CSS parser accepts trailing position arguments
https://bugs.webkit.org/show_bug.cgi?id=129514
Reviewed by Andreas Kling.
Source/WebCore:
Add a check to make sure there are no remaining function args
following a position in the circle() and ellipse() css shape
functions.
Updated existing parsing tests.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseBasicShapeCircle):
(WebCore::CSSParser::parseBasicShapeEllipse):
LayoutTests:
Add a shape with an additional argument trailing the position
in the css shapes functions.
* 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="#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 (165654 => 165655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-14 21:53:22 UTC (rev 165654)
+++ trunk/LayoutTests/ChangeLog 2014-03-14 21:58:35 UTC (rev 165655)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-14 Bear Travis <betravis@adobe.com>
+
+ [CSS Shapes] CSS parser accepts trailing position arguments
+ https://bugs.webkit.org/show_bug.cgi?id=129514
+
+ Reviewed by Andreas Kling.
+
+ Add a shape with an additional argument trailing the position
+ in the css shapes functions.
+
+ * 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-03-14 Dirk Schulze <krit@webkit.org>
</span><span class="cx">
</span><span class="cx"> Refactor Path to Path2D and remove currentPath
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeinsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt (165654 => 165655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-03-14 21:53:22 UTC (rev 165654)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-inside-expected.txt 2014-03-14 21:58:35 UTC (rev 165655)
</span><span class="lines">@@ -205,6 +205,8 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px at center)") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "circle(at center center 10px)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "circle(at center center 10px)") is "none"
</span><ins>+PASS getCSSText("-webkit-shape-inside", "circle(at 10px 10px closest-side)") is ""
+PASS getComputedStyleValue("-webkit-shape-inside", "circle(at 10px 10px closest-side)") is "none"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-inside", "ellipse(10px 20px 30px)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-inside", "ellipse(10px 20px 30px)") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-inside", "ellipse(10px at 10px 10px 10px)") is ""
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt (165654 => 165655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-03-14 21:53:22 UTC (rev 165654)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-03-14 21:58:35 UTC (rev 165655)
</span><span class="lines">@@ -203,6 +203,8 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(at 10px 10px at center)") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(at center center 10px)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle(at center center 10px)") is "none"
</span><ins>+PASS getCSSText("-webkit-shape-outside", "circle(at 10px 10px closest-side)") is ""
+PASS getComputedStyleValue("-webkit-shape-outside", "circle(at 10px 10px closest-side)") is "none"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px 20px 30px)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "ellipse(10px 20px 30px)") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "ellipse(10px at 10px 10px 10px)") is ""
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingtestutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js (165654 => 165655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-03-14 21:53:22 UTC (rev 165654)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-03-14 21:58:35 UTC (rev 165655)
</span><span class="lines">@@ -118,6 +118,7 @@
</span><span class="cx"> "circle(at 10px 10px 10px)",
</span><span class="cx"> "circle(at 10px 10px at center)",
</span><span class="cx"> "circle(at center center 10px)",
</span><ins>+ "circle(at 10px 10px closest-side)",
</ins><span class="cx">
</span><span class="cx"> "ellipse(10px 20px 30px)",
</span><span class="cx"> "ellipse(10px at 10px 10px 10px)",
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165654 => 165655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-14 21:53:22 UTC (rev 165654)
+++ trunk/Source/WebCore/ChangeLog 2014-03-14 21:58:35 UTC (rev 165655)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-03-14 Bear Travis <betravis@adobe.com>
+
+ [CSS Shapes] CSS parser accepts trailing position arguments
+ https://bugs.webkit.org/show_bug.cgi?id=129514
+
+ Reviewed by Andreas Kling.
+
+ Add a check to make sure there are no remaining function args
+ following a position in the circle() and ellipse() css shape
+ functions.
+
+ Updated existing parsing tests.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseBasicShapeCircle):
+ (WebCore::CSSParser::parseBasicShapeEllipse):
+
</ins><span class="cx"> 2014-03-14 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the iOS build and sort the exports file.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (165654 => 165655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-03-14 21:53:22 UTC (rev 165654)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-03-14 21:58:35 UTC (rev 165655)
</span><span class="lines">@@ -5510,7 +5510,7 @@
</span><span class="cx"> RefPtr<CSSValue> centerY;
</span><span class="cx"> args->next(); // set list to start of position center
</span><span class="cx"> parseFillPosition(args, centerX, centerY);
</span><del>- if (centerX && centerY) {
</del><ins>+ if (centerX && centerY && !args->current()) {
</ins><span class="cx"> ASSERT(centerX->isPrimitiveValue());
</span><span class="cx"> ASSERT(centerY->isPrimitiveValue());
</span><span class="cx"> shape->setCenterX(toCSSPrimitiveValue(centerX.get()));
</span><span class="lines">@@ -5561,7 +5561,7 @@
</span><span class="cx"> RefPtr<CSSValue> centerY;
</span><span class="cx"> args->next(); // set list to start of position center
</span><span class="cx"> parseFillPosition(args, centerX, centerY);
</span><del>- if (!centerX || !centerY)
</del><ins>+ if (!centerX || !centerY || args->current())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> ASSERT(centerX->isPrimitiveValue());
</span></span></pre>
</div>
</div>
</body>
</html>