<!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>[163103] trunk/Source/WebKit2</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/163103">163103</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-30 12:57:32 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in RemoteLayerBackingStore::encode when m_frontBuffer is nullptr.
https://bugs.webkit.org/show_bug.cgi?id=127756
Patch by Jeremy Jones <jeremyj@apple.com> on 2014-01-30
Reviewed by Jer Noble.
Don't encode RemoteLayerBackingStore when it has no front buffer.
* Shared/mac/RemoteLayerBackingStore.h:
(WebKit::RemoteLayerBackingStore::hasFrontBuffer):
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoreh">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h</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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163102 => 163103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-30 20:44:42 UTC (rev 163102)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-30 20:57:32 UTC (rev 163103)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-30 Jeremy Jones <jeremyj@apple.com>
+
+ Crash in RemoteLayerBackingStore::encode when m_frontBuffer is nullptr.
+ https://bugs.webkit.org/show_bug.cgi?id=127756
+
+ Reviewed by Jer Noble.
+
+ Don't encode RemoteLayerBackingStore when it has no front buffer.
+
+ * Shared/mac/RemoteLayerBackingStore.h:
+ (WebKit::RemoteLayerBackingStore::hasFrontBuffer):
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
+
</ins><span class="cx"> 2014-01-30 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> Host plug-ins in XPC services
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h (163102 => 163103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h 2014-01-30 20:44:42 UTC (rev 163102)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h 2014-01-30 20:57:32 UTC (rev 163103)
</span><span class="lines">@@ -69,8 +69,7 @@
</span><span class="cx">
</span><span class="cx"> void enumerateRectsBeingDrawn(CGContextRef, void (^)(CGRect));
</span><span class="cx">
</span><del>-private:
- bool hasFrontBuffer()
</del><ins>+ bool hasFrontBuffer() const
</ins><span class="cx"> {
</span><span class="cx"> #if USE(IOSURFACE)
</span><span class="cx"> if (m_acceleratesDrawing)
</span><span class="lines">@@ -78,6 +77,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> return !!m_frontBuffer;
</span><span class="cx"> }
</span><ins>+private:
</ins><span class="cx">
</span><span class="cx"> void drawInContext(WebCore::GraphicsContext&, CGImageRef frontImage);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (163102 => 163103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2014-01-30 20:44:42 UTC (rev 163102)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2014-01-30 20:57:32 UTC (rev 163103)
</span><span class="lines">@@ -167,8 +167,11 @@
</span><span class="cx"> if (changedProperties & TimeOffsetChanged)
</span><span class="cx"> encoder << timeOffset;
</span><span class="cx">
</span><del>- if (changedProperties & BackingStoreChanged)
- encoder << backingStore;
</del><ins>+ if (changedProperties & BackingStoreChanged) {
+ encoder << backingStore.hasFrontBuffer();
+ if (backingStore.hasFrontBuffer())
+ encoder << backingStore;
+ }
</ins><span class="cx">
</span><span class="cx"> if (changedProperties & FiltersChanged)
</span><span class="cx"> encoder << filters;
</span><span class="lines">@@ -306,8 +309,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (result.changedProperties & BackingStoreChanged) {
</span><del>- if (!decoder.decode(result.backingStore))
</del><ins>+ bool hasFrontBuffer = false;
+ if (!decoder.decode(hasFrontBuffer))
</ins><span class="cx"> return false;
</span><ins>+ if (hasFrontBuffer && !decoder.decode(result.backingStore))
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (result.changedProperties & FiltersChanged) {
</span></span></pre>
</div>
</div>
</body>
</html>