<!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>[200003] releases/WebKitGTK/webkit-2.12</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/200003">200003</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-25 06:08:42 -0700 (Mon, 25 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/199561">r199561</a> - CrashTracer: com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::CachedResource::addClientToSet + 27
https://bugs.webkit.org/show_bug.cgi?id=156602
<rdar://problem/18921091>
Reviewed by Simon Fraser.
Source/WebCore:
The CSS property list-style-image is inherited, so a transition on a parent
might cause a transition on a child. On that child, the value might be between
two generated crossfade images which haven't yet resolved, causing a crash.
Test: transitions/crossfade-transition.html
* css/CSSCrossfadeValue.cpp:
(WebCore::CSSCrossfadeValue::blend): Return null if there are no cached images.
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFunc): If we don't have an actual image to blend between, fall
out to the default case.
LayoutTests:
Tests that an animation between two inherited crossfade elements will not crash.
* transitions/crossfade-transition-expected.txt: Added.
* transitions/crossfade-transition.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorecssCSSCrossfadeValuecpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/css/CSSCrossfadeValue.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorepageanimationCSSPropertyAnimationcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTeststransitionscrossfadetransitionexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/transitions/crossfade-transition-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTeststransitionscrossfadetransitionhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/transitions/crossfade-transition.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (200002 => 200003)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-25 13:04:46 UTC (rev 200002)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-25 13:08:42 UTC (rev 200003)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-14 Dean Jackson <dino@apple.com>
+
+ CrashTracer: com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::CachedResource::addClientToSet + 27
+ https://bugs.webkit.org/show_bug.cgi?id=156602
+ <rdar://problem/18921091>
+
+ Reviewed by Simon Fraser.
+
+ Tests that an animation between two inherited crossfade elements will not crash.
+
+ * transitions/crossfade-transition-expected.txt: Added.
+ * transitions/crossfade-transition.html: Added.
+
</ins><span class="cx"> 2016-04-14 Antonio Gomes <tonikitoo@webkit.org>
</span><span class="cx">
</span><span class="cx"> Allow listbox content and scrollbar to intrude padding area.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTeststransitionscrossfadetransitionexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/transitions/crossfade-transition-expected.txt (0 => 200003)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/transitions/crossfade-transition-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/transitions/crossfade-transition-expected.txt 2016-04-25 13:08:42 UTC (rev 200003)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Test passes if there is no crash
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTeststransitionscrossfadetransitionhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/transitions/crossfade-transition.html (0 => 200003)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/transitions/crossfade-transition.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/transitions/crossfade-transition.html 2016-04-25 13:08:42 UTC (rev 200003)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<script>
+if (window.testRunner) {
+ window.testRunner.waitUntilDone();
+ window.testRunner.dumpAsText();
+}
+
+window.addEventListener("load", function () {
+ setTimeout(function () {
+ document.body.className = "foo";
+ if (window.testRunner) {
+ setTimeout(function () {
+ window.testRunner.notifyDone();
+ }, 50);
+ }
+ }, 0);
+}, false);
+</script>
+<style>
+.a > li,
+.a > li p {
+ transition: all 0.1s ease;
+}
+
+.a > li.b {
+ list-style-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"><rect width="1" height="1" fill="blue"/></svg>');
+}
+.foo .a > li.b {
+ list-style-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"><rect width="1" height="1" fill="red"/></svg>');
+}
+
+</style>
+<ul class="a">
+ <li class="b">
+ <p>Test passes if there is no crash</p>
+ </li>
+</ul>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (200002 => 200003)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 13:04:46 UTC (rev 200002)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 13:08:42 UTC (rev 200003)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-04-14 Dean Jackson <dino@apple.com>
+
+ CrashTracer: com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::CachedResource::addClientToSet + 27
+ https://bugs.webkit.org/show_bug.cgi?id=156602
+ <rdar://problem/18921091>
+
+ Reviewed by Simon Fraser.
+
+ The CSS property list-style-image is inherited, so a transition on a parent
+ might cause a transition on a child. On that child, the value might be between
+ two generated crossfade images which haven't yet resolved, causing a crash.
+
+ Test: transitions/crossfade-transition.html
+
+ * css/CSSCrossfadeValue.cpp:
+ (WebCore::CSSCrossfadeValue::blend): Return null if there are no cached images.
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::blendFunc): If we don't have an actual image to blend between, fall
+ out to the default case.
+
</ins><span class="cx"> 2016-04-14 Antonio Gomes <tonikitoo@webkit.org>
</span><span class="cx">
</span><span class="cx"> Allow listbox content and scrollbar to intrude padding area.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorecssCSSCrossfadeValuecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/css/CSSCrossfadeValue.cpp (200002 => 200003)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/css/CSSCrossfadeValue.cpp 2016-04-25 13:04:46 UTC (rev 200002)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/css/CSSCrossfadeValue.cpp 2016-04-25 13:08:42 UTC (rev 200003)
</span><span class="lines">@@ -194,6 +194,8 @@
</span><span class="cx"> RefPtr<CSSCrossfadeValue> CSSCrossfadeValue::blend(const CSSCrossfadeValue& from, double progress) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(equalInputImages(from));
</span><ins>+ if (!m_cachedToImage || !m_cachedFromImage)
+ return nullptr;
</ins><span class="cx"> RefPtr<StyleCachedImage> toStyledImage = StyleCachedImage::create(m_cachedToImage.get());
</span><span class="cx"> RefPtr<StyleCachedImage> fromStyledImage = StyleCachedImage::create(m_cachedFromImage.get());
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (200002 => 200003)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-04-25 13:04:46 UTC (rev 200002)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-04-25 13:08:42 UTC (rev 200003)
</span><span class="lines">@@ -318,8 +318,10 @@
</span><span class="cx"> if (is<CSSCrossfadeValue>(fromGenerated) && is<CSSCrossfadeValue>(toGenerated)) {
</span><span class="cx"> CSSCrossfadeValue& fromCrossfade = downcast<CSSCrossfadeValue>(fromGenerated);
</span><span class="cx"> CSSCrossfadeValue& toCrossfade = downcast<CSSCrossfadeValue>(toGenerated);
</span><del>- if (fromCrossfade.equalInputImages(toCrossfade))
- return StyleGeneratedImage::create(*toCrossfade.blend(fromCrossfade, progress));
</del><ins>+ if (fromCrossfade.equalInputImages(toCrossfade)) {
+ if (auto crossfadeBlend = toCrossfade.blend(fromCrossfade, progress))
+ return StyleGeneratedImage::create(*crossfadeBlend);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Add support for animation between two *gradient() functions.
</span></span></pre>
</div>
</div>
</body>
</html>