<!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>[166894] 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/166894">166894</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-07 17:01:56 -0700 (Mon, 07 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] inset complex calc() args vanish in serialized computed style
https://bugs.webkit.org/show_bug.cgi?id=129838
Reviewed by Bem Jones-Bey.
Source/WebCore:
We didn't pass the style parameter when setting the width members of CSSBasicShapeInset,
which lead to a 'should never reach asserttion' in CSSPrimitiveValue::init. This patch
adds the missing parameters to the call sites.
Extended existing parsing test script.
* css/BasicShapeFunctions.cpp:
(WebCore::valueForBasicShape):
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="#trunkSourceWebCorecssBasicShapeFunctionscpp">trunk/Source/WebCore/css/BasicShapeFunctions.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166893 => 166894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-07 23:54:11 UTC (rev 166893)
+++ trunk/LayoutTests/ChangeLog 2014-04-08 00:01:56 UTC (rev 166894)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-07 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] inset complex calc() args vanish in serialized computed style
+ https://bugs.webkit.org/show_bug.cgi?id=129838
+
+ 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-03-30 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Move slow JSRegress tests out of the way so that they don't show up in run-jsc-benchmarks runs and also skip tests that are extremely long-running
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt (166893 => 166894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-04-07 23:54:11 UTC (rev 166893)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-04-08 00:01:56 UTC (rev 166894)
</span><span class="lines">@@ -55,6 +55,8 @@
</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 class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)") is "inset(10px 20px 30px 40px round 5px 6px 7px 8px / 50px 60px 70px 80px)"
</span><ins>+PASS getCSSText("-webkit-shape-outside", "inset(calc(25%*3 - 10in) 0 0 0)") is "inset(calc(75% - 10in) 0px 0px 0px)"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(calc(25%*3 - 10in) 0 0 0)") is "inset(calc(75% - 960px) 0px 0px 0px round 0px 0px 0px 0px / 0px 0px 0px 0px)"
</ins><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle()") is "circle(at 50% 50%)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "circle()") is "circle(closest-side at 50% 50%)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "circle(farthest-side)") is "circle(farthest-side at 50% 50%)"
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingtestutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js (166893 => 166894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-04-07 23:54:11 UTC (rev 166893)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-04-08 00:01:56 UTC (rev 166894)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><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><ins>+ ["inset(calc(25%*3 - 10in) 0 0 0)", "inset(calc(75% - 10in) 0px 0px 0px)", "inset(calc(75% - 960px) 0px 0px 0px round 0px 0px 0px 0px / 0px 0px 0px 0px)"],
+
</ins><span class="cx"> ["circle()", "circle(at 50% 50%)", "circle(closest-side at 50% 50%)"],
</span><span class="cx"> ["circle(farthest-side)", "circle(farthest-side at 50% 50%)", "circle(farthest-side at 50% 50%)"],
</span><span class="cx"> ["circle(closest-side)", "circle(closest-side at 50% 50%)", "circle(closest-side at 50% 50%)"],
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166893 => 166894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-07 23:54:11 UTC (rev 166893)
+++ trunk/Source/WebCore/ChangeLog 2014-04-08 00:01:56 UTC (rev 166894)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-07 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] inset complex calc() args vanish in serialized computed style
+ https://bugs.webkit.org/show_bug.cgi?id=129838
+
+ Reviewed by Bem Jones-Bey.
+
+ We didn't pass the style parameter when setting the width members of CSSBasicShapeInset,
+ which lead to a 'should never reach asserttion' in CSSPrimitiveValue::init. This patch
+ adds the missing parameters to the call sites.
+
+ Extended existing parsing test script.
+
+ * css/BasicShapeFunctions.cpp:
+ (WebCore::valueForBasicShape):
+
</ins><span class="cx"> 2014-04-07 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] MediaDocument should allow autoplay
</span></span></pre></div>
<a id="trunkSourceWebCorecssBasicShapeFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/BasicShapeFunctions.cpp (166893 => 166894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-04-07 23:54:11 UTC (rev 166893)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-04-08 00:01:56 UTC (rev 166894)
</span><span class="lines">@@ -107,10 +107,10 @@
</span><span class="cx"> const BasicShapeInset* inset = static_cast<const BasicShapeInset*>(basicShape);
</span><span class="cx"> RefPtr<CSSBasicShapeInset> insetValue = CSSBasicShapeInset::create();
</span><span class="cx">
</span><del>- insetValue->setTop(pool.createValue(inset->top()));
- insetValue->setRight(pool.createValue(inset->right()));
- insetValue->setBottom(pool.createValue(inset->bottom()));
- insetValue->setLeft(pool.createValue(inset->left()));
</del><ins>+ insetValue->setTop(pool.createValue(inset->top(), style));
+ insetValue->setRight(pool.createValue(inset->right(), style));
+ insetValue->setBottom(pool.createValue(inset->bottom(), style));
+ insetValue->setLeft(pool.createValue(inset->left(), style));
</ins><span class="cx">
</span><span class="cx"> insetValue->setTopLeftRadius(pool.createValue(inset->topLeftRadius()));
</span><span class="cx"> insetValue->setTopRightRadius(pool.createValue(inset->topRightRadius()));
</span></span></pre>
</div>
</div>
</body>
</html>