<!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>[167936] 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/167936">167936</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-29 09:17:09 -0700 (Tue, 29 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] complex calc args for inset round vanish
https://bugs.webkit.org/show_bug.cgi?id=132293
Reviewed by Bem Jones-Bey.
Source/WebCore:
In order to use calc in the rounded parameters for inset shapes, we need
to pass RenderStyle for the value creation as we did for the width arguments.
Without taking RenderStyle into account, we hit an assert not reache
in CSSPrimitiveValue::init in the debug builds.
I've added new parsing test.
* css/BasicShapeFunctions.cpp:
(WebCore::valueForBasicShape):
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::init):
* css/CSSPrimitiveValue.h:
(WebCore::CSSPrimitiveValue::create):
* css/CSSValuePool.h:
(WebCore::CSSValuePool::createValue):
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>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueh">trunk/Source/WebCore/css/CSSPrimitiveValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuePoolh">trunk/Source/WebCore/css/CSSValuePool.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167935 => 167936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-29 16:16:11 UTC (rev 167935)
+++ trunk/LayoutTests/ChangeLog 2014-04-29 16:17:09 UTC (rev 167936)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-04-29 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><ins>+ [CSS Shapes] complex calc args for inset round vanish
+ https://bugs.webkit.org/show_bug.cgi?id=132293
+
+ Reviewed by Bem Jones-Bey.
+
+ * fast/shapes/parsing/parsing-shape-outside-expected.txt:
+ * fast/shapes/parsing/parsing-test-utils.js:
+
+2014-04-29 Zoltan Horvath <zoltan@webkit.org>
+
</ins><span class="cx"> [CSS Shapes] complex calc values for shape-margin return null for computed style
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132313
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt (167935 => 167936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-04-29 16:16:11 UTC (rev 167935)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-04-29 16:17:09 UTC (rev 167936)
</span><span class="lines">@@ -67,6 +67,8 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px round 0px / 10px)") is "inset(10px round 0px / 10px)"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "inset(calc(25%*3 - 10in) 0 0 0)") is "inset(calc(75% - 10in) 0px 0px)"
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "inset(calc(25%*3 - 10in) 0 0 0)") is "inset(calc(75% - 960px) 0px 0px)"
</span><ins>+PASS getCSSText("-webkit-shape-outside", "inset(10px 10px 10px 10px round calc(25%*3 - 10in))") is "inset(10px round calc(75% - 10in))"
+PASS getComputedStyleValue("-webkit-shape-outside", "inset(10px 10px 10px 10px round calc(25%*3 - 10in))") is "inset(10px round calc(75% - 960px))"
</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 (167935 => 167936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-04-29 16:16:11 UTC (rev 167935)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-test-utils.js 2014-04-29 16:17:09 UTC (rev 167936)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> "inset(10px round 0px / 10px)",
</span><span class="cx">
</span><span class="cx"> ["inset(calc(25%*3 - 10in) 0 0 0)", "inset(calc(75% - 10in) 0px 0px)", "inset(calc(75% - 960px) 0px 0px)"],
</span><ins>+ ["inset(10px 10px 10px 10px round calc(25%*3 - 10in))", "inset(10px round calc(75% - 10in))", "inset(10px round calc(75% - 960px))"],
</ins><span class="cx">
</span><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></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167935 => 167936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-29 16:16:11 UTC (rev 167935)
+++ trunk/Source/WebCore/ChangeLog 2014-04-29 16:17:09 UTC (rev 167936)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-04-29 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><ins>+ [CSS Shapes] complex calc args for inset round vanish
+ https://bugs.webkit.org/show_bug.cgi?id=132293
+
+ Reviewed by Bem Jones-Bey.
+
+ In order to use calc in the rounded parameters for inset shapes, we need
+ to pass RenderStyle for the value creation as we did for the width arguments.
+ Without taking RenderStyle into account, we hit an assert not reache
+ in CSSPrimitiveValue::init in the debug builds.
+
+ I've added new parsing test.
+
+ * css/BasicShapeFunctions.cpp:
+ (WebCore::valueForBasicShape):
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::init):
+ * css/CSSPrimitiveValue.h:
+ (WebCore::CSSPrimitiveValue::create):
+ * css/CSSValuePool.h:
+ (WebCore::CSSValuePool::createValue):
+
+2014-04-29 Zoltan Horvath <zoltan@webkit.org>
+
</ins><span class="cx"> [CSS Shapes] complex calc values for shape-margin return null for computed style
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132313
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssBasicShapeFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/BasicShapeFunctions.cpp (167935 => 167936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-04-29 16:16:11 UTC (rev 167935)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-04-29 16:17:09 UTC (rev 167936)
</span><span class="lines">@@ -112,10 +112,10 @@
</span><span class="cx"> insetValue->setBottom(pool.createValue(inset->bottom(), style));
</span><span class="cx"> insetValue->setLeft(pool.createValue(inset->left(), style));
</span><span class="cx">
</span><del>- insetValue->setTopLeftRadius(pool.createValue(inset->topLeftRadius()));
- insetValue->setTopRightRadius(pool.createValue(inset->topRightRadius()));
- insetValue->setBottomRightRadius(pool.createValue(inset->bottomRightRadius()));
- insetValue->setBottomLeftRadius(pool.createValue(inset->bottomLeftRadius()));
</del><ins>+ insetValue->setTopLeftRadius(pool.createValue(inset->topLeftRadius(), style));
+ insetValue->setTopRightRadius(pool.createValue(inset->topRightRadius(), style));
+ insetValue->setBottomRightRadius(pool.createValue(inset->bottomRightRadius(), style));
+ insetValue->setBottomLeftRadius(pool.createValue(inset->bottomLeftRadius(), style));
</ins><span class="cx">
</span><span class="cx"> basicShapeValue = insetValue.release();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (167935 => 167936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2014-04-29 16:16:11 UTC (rev 167935)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2014-04-29 16:17:09 UTC (rev 167936)
</span><span class="lines">@@ -317,10 +317,10 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSPrimitiveValue::CSSPrimitiveValue(const LengthSize& lengthSize)
</del><ins>+CSSPrimitiveValue::CSSPrimitiveValue(const LengthSize& lengthSize, const RenderStyle* style)
</ins><span class="cx"> : CSSValue(PrimitiveClass)
</span><span class="cx"> {
</span><del>- init(lengthSize);
</del><ins>+ init(lengthSize, style);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSPrimitiveValue::init(const Length& length)
</span><span class="lines">@@ -388,11 +388,11 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSPrimitiveValue::init(const LengthSize& lengthSize)
</del><ins>+void CSSPrimitiveValue::init(const LengthSize& lengthSize, const RenderStyle* style)
</ins><span class="cx"> {
</span><span class="cx"> m_primitiveUnitType = CSS_PAIR;
</span><span class="cx"> m_hasCachedCSSText = false;
</span><del>- m_value.pair = Pair::create(create(lengthSize.width()), create(lengthSize.height())).leakRef();
</del><ins>+ m_value.pair = Pair::create(create(lengthSize.width(), style), create(lengthSize.height(), style)).leakRef();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSPrimitiveValue::init(PassRefPtr<Counter> c)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (167935 => 167936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2014-04-29 16:16:11 UTC (rev 167935)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2014-04-29 16:17:09 UTC (rev 167936)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> static PassRef<CSSPrimitiveValue> create(double value, UnitTypes type) { return adoptRef(*new CSSPrimitiveValue(value, type)); }
</span><span class="cx"> static PassRef<CSSPrimitiveValue> create(const String& value, UnitTypes type) { return adoptRef(*new CSSPrimitiveValue(value, type)); }
</span><span class="cx"> static PassRef<CSSPrimitiveValue> create(const Length& value, const RenderStyle* style) { return adoptRef(*new CSSPrimitiveValue(value, style)); }
</span><del>- static PassRef<CSSPrimitiveValue> create(const LengthSize& value) { return adoptRef(*new CSSPrimitiveValue(value)); }
</del><ins>+ static PassRef<CSSPrimitiveValue> create(const LengthSize& value, const RenderStyle* style) { return adoptRef(*new CSSPrimitiveValue(value, style)); }
</ins><span class="cx">
</span><span class="cx"> template<typename T> static PassRef<CSSPrimitiveValue> create(T value)
</span><span class="cx"> {
</span><span class="lines">@@ -346,7 +346,7 @@
</span><span class="cx"> CSSPrimitiveValue(unsigned color); // RGB value
</span><span class="cx"> CSSPrimitiveValue(const Length&);
</span><span class="cx"> CSSPrimitiveValue(const Length&, const RenderStyle*);
</span><del>- CSSPrimitiveValue(const LengthSize&);
</del><ins>+ CSSPrimitiveValue(const LengthSize&, const RenderStyle*);
</ins><span class="cx"> CSSPrimitiveValue(const String&, UnitTypes);
</span><span class="cx"> CSSPrimitiveValue(double, UnitTypes);
</span><span class="cx">
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> template<typename T> operator T*(); // compile-time guard
</span><span class="cx">
</span><span class="cx"> void init(const Length&);
</span><del>- void init(const LengthSize&);
</del><ins>+ void init(const LengthSize&, const RenderStyle*);
</ins><span class="cx"> void init(PassRefPtr<Counter>);
</span><span class="cx"> void init(PassRefPtr<Rect>);
</span><span class="cx"> void init(PassRefPtr<Pair>);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuePoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValuePool.h (167935 => 167936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValuePool.h 2014-04-29 16:16:11 UTC (rev 167935)
+++ trunk/Source/WebCore/css/CSSValuePool.h 2014-04-29 16:17:09 UTC (rev 167936)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> PassRef<CSSPrimitiveValue> createValue(double value, CSSPrimitiveValue::UnitTypes);
</span><span class="cx"> PassRef<CSSPrimitiveValue> createValue(const String& value, CSSPrimitiveValue::UnitTypes type) { return CSSPrimitiveValue::create(value, type); }
</span><span class="cx"> PassRef<CSSPrimitiveValue> createValue(const Length& value, const RenderStyle* style) { return CSSPrimitiveValue::create(value, style); }
</span><del>- PassRef<CSSPrimitiveValue> createValue(const LengthSize& value) { return CSSPrimitiveValue::create(value); }
</del><ins>+ PassRef<CSSPrimitiveValue> createValue(const LengthSize& value, const RenderStyle* style) { return CSSPrimitiveValue::create(value, style); }
</ins><span class="cx"> template<typename T> static PassRef<CSSPrimitiveValue> createValue(T value) { return CSSPrimitiveValue::create(value); }
</span><span class="cx">
</span><span class="cx"> void drain();
</span></span></pre>
</div>
</div>
</body>
</html>