<!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>[160010] 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/160010">160010</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-03 09:29:22 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: !value || (value->isPrimitiveValue()) in WebCore::StyleProperties::getLayeredShorthandValue.
https://bugs.webkit.org/show_bug.cgi?id=125146
Patch by László Langó <lango@inf.u-szeged.hu> on 2013-12-03
Reviewed by Darin Adler.
Source/WebCore:
Do not presume that |yValue| is primitive if |value| is implicit in StylePropertySerializer.
An implicit y-value can become explicit if specified as a separate longhand.
At the same time, its new value can be non-primitive.
Backported from Blink:
http://src.chromium.org/viewvc/blink?view=rev&rev=153678
Test: fast/css/webkit-mask-crash-implicit.html
* css/StyleProperties.cpp:
(WebCore::StyleProperties::getLayeredShorthandValue):
LayoutTests:
* fast/css/webkit-mask-crash-implicit-expected.txt: Added.
* fast/css/webkit-mask-crash-implicit.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiescpp">trunk/Source/WebCore/css/StyleProperties.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcsswebkitmaskcrashimplicitexpectedtxt">trunk/LayoutTests/fast/css/webkit-mask-crash-implicit-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsswebkitmaskcrashimplicithtml">trunk/LayoutTests/fast/css/webkit-mask-crash-implicit.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160009 => 160010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-03 17:26:36 UTC (rev 160009)
+++ trunk/LayoutTests/ChangeLog 2013-12-03 17:29:22 UTC (rev 160010)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-03 László Langó <lango@inf.u-szeged.hu>
+
+ ASSERTION FAILED: !value || (value->isPrimitiveValue()) in WebCore::StyleProperties::getLayeredShorthandValue.
+ https://bugs.webkit.org/show_bug.cgi?id=125146
+
+ Reviewed by Darin Adler.
+
+ * fast/css/webkit-mask-crash-implicit-expected.txt: Added.
+ * fast/css/webkit-mask-crash-implicit.html: Added.
+
</ins><span class="cx"> 2013-12-03 Rob Buis <rob.buis@samsung.com>
</span><span class="cx">
</span><span class="cx"> [css shapes] layout for new ellipse syntax
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsswebkitmaskcrashimplicitexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/webkit-mask-crash-implicit-expected.txt (0 => 160010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/webkit-mask-crash-implicit-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/webkit-mask-crash-implicit-expected.txt 2013-12-03 17:29:22 UTC (rev 160010)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+FAIL document.styleSheets[1].rules[0].style.cssText should be -webkit-mask-repeat: repeat-x; -webkit-mask-repeat-y: inherit;. Was -webkit-mask: inherit;.
+FAIL document.styleSheets[1].rules[0].style.getPropertyValue('-webkit-mask') should be . Was inherit.
+FAIL document.styleSheets[1].rules[0].style.getPropertyValue('-webkit-mask-repeat') should be repeat inherit. Was inherit.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcsswebkitmaskcrashimplicithtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/webkit-mask-crash-implicit.html (0 => 160010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/webkit-mask-crash-implicit.html (rev 0)
+++ trunk/LayoutTests/fast/css/webkit-mask-crash-implicit.html 2013-12-03 17:29:22 UTC (rev 160010)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+.box {
+-webkit-mask-repeat: repeat-x; -webkit-mask-repeat-y: inherit;
+}
+</style>
+<script>
+if (window.internals)
+ testRunner.dumpAsText();
+shouldBeEqualToString("document.styleSheets[1].rules[0].style.cssText", "-webkit-mask-repeat: repeat-x; -webkit-mask-repeat-y: inherit;");
+shouldBeEqualToString("document.styleSheets[1].rules[0].style.getPropertyValue('-webkit-mask')", "");
+shouldBeEqualToString("document.styleSheets[1].rules[0].style.getPropertyValue('-webkit-mask-repeat')", "repeat inherit");
+</script>
+</head>
+<body>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160009 => 160010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-03 17:26:36 UTC (rev 160009)
+++ trunk/Source/WebCore/ChangeLog 2013-12-03 17:29:22 UTC (rev 160010)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-12-03 László Langó <lango@inf.u-szeged.hu>
+
+ ASSERTION FAILED: !value || (value->isPrimitiveValue()) in WebCore::StyleProperties::getLayeredShorthandValue.
+ https://bugs.webkit.org/show_bug.cgi?id=125146
+
+ Reviewed by Darin Adler.
+
+ Do not presume that |yValue| is primitive if |value| is implicit in StylePropertySerializer.
+ An implicit y-value can become explicit if specified as a separate longhand.
+ At the same time, its new value can be non-primitive.
+
+ Backported from Blink:
+ http://src.chromium.org/viewvc/blink?view=rev&rev=153678
+
+ Test: fast/css/webkit-mask-crash-implicit.html
+
+ * css/StyleProperties.cpp:
+ (WebCore::StyleProperties::getLayeredShorthandValue):
+
</ins><span class="cx"> 2013-12-03 Rob Buis <rob.buis@samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix build break after r160007.
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.cpp (160009 => 160010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.cpp 2013-12-03 17:26:36 UTC (rev 160009)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2013-12-03 17:29:22 UTC (rev 160010)
</span><span class="lines">@@ -411,6 +411,9 @@
</span><span class="cx"> else
</span><span class="cx"> yValue = nextValue;
</span><span class="cx">
</span><ins>+ if (!value->isPrimitiveValue() || !yValue->isPrimitiveValue())
+ continue;
+
</ins><span class="cx"> CSSValueID xId = toCSSPrimitiveValue(value.get())->getValueID();
</span><span class="cx"> CSSValueID yId = toCSSPrimitiveValue(yValue.get())->getValueID();
</span><span class="cx"> if (xId != yId) {
</span></span></pre>
</div>
</div>
</body>
</html>