<!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>[168228] 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/168228">168228</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-05-03 13:32:31 -0700 (Sat, 03 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[UI-side compositing] Assertion in PlatformCAFilters::setFiltersOnLayer with animated reference filter
https://bugs.webkit.org/show_bug.cgi?id=132528
<rdar://problem/16671660>
Reviewed by Tim Horton.
Source/WebKit2:
Allow PASSTHROUGH filters to be encoded and sent to the UI process; they can be set
on layers as the result of a filter animation using a reference filter, and just get
ignored anyway, but encoding them maintains consistency of the filters list.
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<FilterOperation>::encode): Assert during encoding if
we try to encode a NONE or REFERENCE filter (to match the decoding assertions).
(IPC::decodeFilterOperation): Allow decoding of PASSTHROUGH filters. Have
trying to decode a NONE or REFERENCE filter mark the message as invalid.
(IPC::ArgumentCoder<IDBKeyData>::decode): Mark the message invalid when receiving
unexpected key types.
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTextStream::operator<<): Have the logging not crash if
a filter is null (should never happen).
LayoutTests:
Make the animation duration a little longer to cause bug 132528 to reproduce more
reliably. The test does notifyDone() from an animation start event, so this doesn't
increase test duration.
* css3/filters/crash-filter-animation-invalid-url.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3filterscrashfilteranimationinvalidurlhtml">trunk/LayoutTests/css3/filters/crash-filter-animation-invalid-url.html</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168227 => 168228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-03 20:32:24 UTC (rev 168227)
+++ trunk/LayoutTests/ChangeLog 2014-05-03 20:32:31 UTC (rev 168228)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-05-03 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ [UI-side compositing] Assertion in PlatformCAFilters::setFiltersOnLayer with animated reference filter
+ https://bugs.webkit.org/show_bug.cgi?id=132528
+ <rdar://problem/16671660>
+
+ Reviewed by Tim Horton.
+
+ Make the animation duration a little longer to cause bug 132528 to reproduce more
+ reliably. The test does notifyDone() from an animation start event, so this doesn't
+ increase test duration.
+
+ * css3/filters/crash-filter-animation-invalid-url.html:
+
+2014-05-03 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Very fuzzy layers under non-decompasable matrices
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132516
</span><span class="cx"> <rdar://problem/16717478>
</span></span></pre></div>
<a id="trunkLayoutTestscss3filterscrashfilteranimationinvalidurlhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/filters/crash-filter-animation-invalid-url.html (168227 => 168228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/crash-filter-animation-invalid-url.html 2014-05-03 20:32:24 UTC (rev 168227)
+++ trunk/LayoutTests/css3/filters/crash-filter-animation-invalid-url.html 2014-05-03 20:32:31 UTC (rev 168228)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> <style>
</span><span class="cx"> a {
</span><span class="cx"> -webkit-animation-name: n;
</span><del>- -webkit-animation-duration: .01s;
</del><ins>+ -webkit-animation-duration: 50ms;
</ins><span class="cx"> }
</span><span class="cx"> @-webkit-keyframes n {
</span><span class="cx"> from {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168227 => 168228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-03 20:32:24 UTC (rev 168227)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-03 20:32:31 UTC (rev 168228)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-05-03 Simon Fraser <simon.fraser@apple.com>
+
+ [UI-side compositing] Assertion in PlatformCAFilters::setFiltersOnLayer with animated reference filter
+ https://bugs.webkit.org/show_bug.cgi?id=132528
+ <rdar://problem/16671660>
+
+ Reviewed by Tim Horton.
+
+ Allow PASSTHROUGH filters to be encoded and sent to the UI process; they can be set
+ on layers as the result of a filter animation using a reference filter, and just get
+ ignored anyway, but encoding them maintains consistency of the filters list.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<FilterOperation>::encode): Assert during encoding if
+ we try to encode a NONE or REFERENCE filter (to match the decoding assertions).
+ (IPC::decodeFilterOperation): Allow decoding of PASSTHROUGH filters. Have
+ trying to decode a NONE or REFERENCE filter mark the message as invalid.
+ (IPC::ArgumentCoder<IDBKeyData>::decode): Mark the message invalid when receiving
+ unexpected key types.
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTextStream::operator<<): Have the logging not crash if
+ a filter is null (should never happen).
+
</ins><span class="cx"> 2014-05-02 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Remove unused WKErrorRecoveryAttempting
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (168227 => 168228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-05-03 20:32:24 UTC (rev 168227)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-05-03 20:32:31 UTC (rev 168228)
</span><span class="lines">@@ -1561,10 +1561,10 @@
</span><span class="cx"> encoder.encodeEnum(filter.type());
</span><span class="cx">
</span><span class="cx"> switch (filter.type()) {
</span><del>- case FilterOperation::REFERENCE: {
</del><ins>+ case FilterOperation::NONE:
+ case FilterOperation::REFERENCE:
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><del>- }
</del><span class="cx"> case FilterOperation::GRAYSCALE:
</span><span class="cx"> case FilterOperation::SEPIA:
</span><span class="cx"> case FilterOperation::SATURATE:
</span><span class="lines">@@ -1591,7 +1591,6 @@
</span><span class="cx"> encoder.encodeEnum(toDefaultFilterOperation(filter).representedType());
</span><span class="cx"> break;
</span><span class="cx"> case FilterOperation::PASSTHROUGH:
</span><del>- case FilterOperation::NONE:
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1603,11 +1602,11 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> switch (type) {
</span><del>- case FilterOperation::PASSTHROUGH:
</del><span class="cx"> case FilterOperation::NONE:
</span><span class="cx"> case FilterOperation::REFERENCE:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- break;
</del><ins>+ decoder.markInvalid();
+ return false;
</ins><span class="cx"> case FilterOperation::GRAYSCALE:
</span><span class="cx"> case FilterOperation::SEPIA:
</span><span class="cx"> case FilterOperation::SATURATE:
</span><span class="lines">@@ -1655,6 +1654,9 @@
</span><span class="cx"> filter = DefaultFilterOperation::create(representedType);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ case FilterOperation::PASSTHROUGH:
+ filter = PassthroughFilterOperation::create();
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -1835,6 +1837,7 @@
</span><span class="cx"> // MaxType and MinType are only used for comparison to other keys.
</span><span class="cx"> // They should never be sent across the wire.
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><ins>+ decoder.markInvalid();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (168227 => 168228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2014-05-03 20:32:24 UTC (rev 168227)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2014-05-03 20:32:31 UTC (rev 168228)
</span><span class="lines">@@ -646,7 +646,10 @@
</span><span class="cx"> RemoteLayerTreeTextStream& ts = *this;
</span><span class="cx"> for (size_t i = 0; i < filters.size(); ++i) {
</span><span class="cx"> const auto filter = filters.at(i);
</span><del>- ts << *filter;
</del><ins>+ if (filter)
+ ts << *filter;
+ else
+ ts << "(null)";
</ins><span class="cx"> if (i < filters.size() - 1)
</span><span class="cx"> ts << " ";
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>