<!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>[179308] 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/179308">179308</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-28 15:20:36 -0800 (Wed, 28 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/177494">r177494</a>): Bad cast to WebKitCSSResourceValue in StyleBuilderConverter::convertMaskImageOperations()
https://bugs.webkit.org/show_bug.cgi?id=140991
<rdar://problem/19625305>
Reviewed by Antti Koivisto.
Source/WebCore:
convertMaskImageOperations() was assuming that the CSSValueList's values
were always WebKitCSSResourceValue values. However, they can be
CSSInitialValues as well so we should check before casting.
Test: css3/masking/mask-image-initial-value-crash.html
* css/StyleBuilderConverter.h:
(WebCore::maskImageValueFromIterator):
(WebCore::StyleBuilderConverter::convertMaskImageOperations):
LayoutTests:
Add layout test to cover the case where a CSSValue is incorrectly casted to
a WebKitCSSResourceValue in StyleBuilderConverter::convertMaskImageOperations(),
thus hitting an assertion in downcast<>() on debug builds.
* css3/masking/mask-image-initial-value-crash-expected.txt: Added.
* css3/masking/mask-image-initial-value-crash.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="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3maskingmaskimageinitialvaluecrashexpectedtxt">trunk/LayoutTests/css3/masking/mask-image-initial-value-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3maskingmaskimageinitialvaluecrashhtml">trunk/LayoutTests/css3/masking/mask-image-initial-value-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179307 => 179308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-28 22:52:22 UTC (rev 179307)
+++ trunk/LayoutTests/ChangeLog 2015-01-28 23:20:36 UTC (rev 179308)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-28 Chris Dumez <cdumez@apple.com>
+
+ Regression(r177494): Bad cast to WebKitCSSResourceValue in StyleBuilderConverter::convertMaskImageOperations()
+ https://bugs.webkit.org/show_bug.cgi?id=140991
+ <rdar://problem/19625305>
+
+ Reviewed by Antti Koivisto.
+
+ Add layout test to cover the case where a CSSValue is incorrectly casted to
+ a WebKitCSSResourceValue in StyleBuilderConverter::convertMaskImageOperations(),
+ thus hitting an assertion in downcast<>() on debug builds.
+
+ * css3/masking/mask-image-initial-value-crash-expected.txt: Added.
+ * css3/masking/mask-image-initial-value-crash.html: Added.
+
</ins><span class="cx"> 2015-01-28 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] More gardening to get the bot green.
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmaskimageinitialvaluecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-image-initial-value-crash-expected.txt (0 => 179308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-image-initial-value-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-image-initial-value-crash-expected.txt 2015-01-28 23:20:36 UTC (rev 179308)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test passes if it doesn't crash.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingmaskimageinitialvaluecrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-image-initial-value-crash.html (0 => 179308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-image-initial-value-crash.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-image-initial-value-crash.html 2015-01-28 23:20:36 UTC (rev 179308)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>This test passes if it doesn't crash.</p>
+<div id="testDiv"></div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+testDiv.style.cssText += "-webkit-mask-position: 0px 0px, 1px 1px";
+testDiv.style.cssText += "-webkit-mask-position: 1px 1px;";
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179307 => 179308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-28 22:52:22 UTC (rev 179307)
+++ trunk/Source/WebCore/ChangeLog 2015-01-28 23:20:36 UTC (rev 179308)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-01-28 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Regression(r177494): Bad cast to WebKitCSSResourceValue in StyleBuilderConverter::convertMaskImageOperations()
+ https://bugs.webkit.org/show_bug.cgi?id=140991
+ <rdar://problem/19625305>
+
+ Reviewed by Antti Koivisto.
+
+ convertMaskImageOperations() was assuming that the CSSValueList's values
+ were always WebKitCSSResourceValue values. However, they can be
+ CSSInitialValues as well so we should check before casting.
+
+ Test: css3/masking/mask-image-initial-value-crash.html
+
+ * css/StyleBuilderConverter.h:
+ (WebCore::maskImageValueFromIterator):
+ (WebCore::StyleBuilderConverter::convertMaskImageOperations):
+
+2015-01-28 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Remove dead code from MemoryCache
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140964
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (179307 => 179308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2015-01-28 22:52:22 UTC (rev 179307)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2015-01-28 23:20:36 UTC (rev 179308)
</span><span class="lines">@@ -1031,6 +1031,14 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline WebKitCSSResourceValue* maskImageValueFromIterator(CSSValueList& maskImagesList, CSSValueList::iterator it)
+{
+ // May also be a CSSInitialValue.
+ if (it == maskImagesList.end() || !is<WebKitCSSResourceValue>(it->get()))
+ return nullptr;
+ return &downcast<WebKitCSSResourceValue>(it->get());
+}
+
</ins><span class="cx"> inline Vector<RefPtr<MaskImageOperation>> StyleBuilderConverter::convertMaskImageOperations(StyleResolver& styleResolver, CSSValue& value)
</span><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<MaskImageOperation>> operations;
</span><span class="lines">@@ -1042,8 +1050,7 @@
</span><span class="cx"> else if (is<CSSValueList>(value)) {
</span><span class="cx"> maskImagesList = &downcast<CSSValueList>(value);
</span><span class="cx"> listIterator = maskImagesList->begin();
</span><del>- if (listIterator != maskImagesList->end())
- maskImageValue = &downcast<WebKitCSSResourceValue>(listIterator->get());
</del><ins>+ maskImageValue = maskImageValueFromIterator(*maskImagesList, listIterator);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while (maskImageValue.get()) {
</span><span class="lines">@@ -1074,10 +1081,9 @@
</span><span class="cx">
</span><span class="cx"> operations.append(newMaskImage);
</span><span class="cx">
</span><del>- if (maskImagesList) {
- ++listIterator;
- maskImageValue = listIterator != maskImagesList->end() ? &downcast<WebKitCSSResourceValue>(listIterator->get()) : nullptr;
- } else
</del><ins>+ if (maskImagesList)
+ maskImageValue = maskImageValueFromIterator(*maskImagesList, ++listIterator);
+ else
</ins><span class="cx"> maskImageValue = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>