<!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>[166813] 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/166813">166813</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-04 16:25:41 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] polygon y-value calc() args serialize incorrectly
https://bugs.webkit.org/show_bug.cgi?id=129842
Reviewed by Bem Jones-Bey.
Source/WebCore:
The code hit ASSERT(isCalculation(value)) in CSSParser::createPrimitiveNumbericValue, because
CSSParser::validUnit had been called on both coordinates, which set the value for m_parsedCalculation,
but only one of the coordinates was calculation value. I reordered calling valudUnit and
createPrimitiveNumbericValue to be called in the correct order on the coordinates.
I added the new test case to parsing-test-utils.js.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseBasicShapePolygon):
LayoutTests:
* fast/shapes/parsing/parsing-shape-outside-expected.txt:
* fast/shapes/parsing/parsing-test-utils.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingtestutilsjs">trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#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 (166812 => 166813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-04-04 23:15:10 UTC (rev 166812)
+++ trunk/LayoutTests/ChangeLog        2014-04-04 23:25:41 UTC (rev 166813)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-04 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] polygon y-value calc() args serialize incorrectly
+ https://bugs.webkit.org/show_bug.cgi?id=129842
+
+ Reviewed by Bem Jones-Bey.
+
+ * fast/shapes/parsing/parsing-shape-outside-expected.txt:
+ * fast/shapes/parsing/parsing-test-utils.js:
+
</ins><span class="cx"> 2014-04-04 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed gardening. Mark a flakey test that is failing intermittenly in pixel tests.
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt (166812 => 166813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt        2014-04-04 23:15:10 UTC (rev 166812)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt        2014-04-04 23:25:41 UTC (rev 166813)
</span><span class="lines">@@ -127,6 +127,10 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)") is "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)") is "polygon(10px 20px, 30px 40px, 40px 50px)"
</span><ins>+PASS getCSSText("-webkit-shape-outside", "polygon(10px calc(10in))") is "polygon(10px calc(10in))"
+PASS getComputedStyleValue("-webkit-shape-outside", "polygon(10px calc(10in))") is "polygon(10px 960px)"
+PASS getCSSText("-webkit-shape-outside", "polygon(calc(10in) 10px)") is "polygon(calc(10in) 10px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "polygon(calc(10in) 10px)") is "polygon(960px 10px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "content-box") is "content-box"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "content-box") is "content-box"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "padding-box") is "padding-box"
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingtestutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js (166812 => 166813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js        2014-04-04 23:15:10 UTC (rev 166812)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js        2014-04-04 23:25:41 UTC (rev 166813)
</span><span class="lines">@@ -71,6 +71,8 @@
</span><span class="cx"> ["polygon(10px 20px, 30px 40px, 40px 50px)", "polygon(10px 20px, 30px 40px, 40px 50px)"],
</span><span class="cx"> ["polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)", "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)"],
</span><span class="cx"> ["polygon(nonzero, 10px 20px, 30px 40px, 40px 50px)", "polygon(10px 20px, 30px 40px, 40px 50px)"],
</span><ins>+ ["polygon(10px calc(10in))", "polygon(10px calc(10in))", "polygon(10px 960px)"],
+ ["polygon(calc(10in) 10px)", "polygon(calc(10in) 10px)", "polygon(960px 10px)"],
</ins><span class="cx">
</span><span class="cx"> "content-box",
</span><span class="cx"> "padding-box",
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166812 => 166813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-04-04 23:15:10 UTC (rev 166812)
+++ trunk/Source/WebCore/ChangeLog        2014-04-04 23:25:41 UTC (rev 166813)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-04-04 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] polygon y-value calc() args serialize incorrectly
+ https://bugs.webkit.org/show_bug.cgi?id=129842
+
+ Reviewed by Bem Jones-Bey.
+
+ The code hit ASSERT(isCalculation(value)) in CSSParser::createPrimitiveNumbericValue, because
+ CSSParser::validUnit had been called on both coordinates, which set the value for m_parsedCalculation,
+ but only one of the coordinates was calculation value. I reordered calling valudUnit and
+ createPrimitiveNumbericValue to be called in the correct order on the coordinates.
+
+ I added the new test case to parsing-test-utils.js.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseBasicShapePolygon):
+
</ins><span class="cx"> 2014-04-04 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Replay: capture and replay wheel events and scroll commands
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (166812 => 166813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp        2014-04-04 23:15:10 UTC (rev 166812)
+++ trunk/Source/WebCore/css/CSSParser.cpp        2014-04-04 23:25:41 UTC (rev 166813)
</span><span class="lines">@@ -5595,14 +5595,14 @@
</span><span class="cx">
</span><span class="cx"> CSSParserValue* argumentX = argument;
</span><span class="cx"> while (argumentX) {
</span><ins>+
</ins><span class="cx"> if (!validUnit(argumentX, FLength | FPercent))
</span><span class="cx"> return 0;
</span><ins>+ RefPtr<CSSPrimitiveValue> xLength = createPrimitiveNumericValue(argumentX);
</ins><span class="cx">
</span><span class="cx"> CSSParserValue* argumentY = args->next();
</span><span class="cx"> if (!argumentY || !validUnit(argumentY, FLength | FPercent))
</span><span class="cx"> return 0;
</span><del>-
- RefPtr<CSSPrimitiveValue> xLength = createPrimitiveNumericValue(argumentX);
</del><span class="cx"> RefPtr<CSSPrimitiveValue> yLength = createPrimitiveNumericValue(argumentY);
</span><span class="cx">
</span><span class="cx"> shape->appendPoint(xLength.release(), yLength.release());
</span></span></pre>
</div>
</div>
</body>
</html>