<!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>[167290] trunk/Source/WebCore</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/167290">167290</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-04-14 19:54:13 -0700 (Mon, 14 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in TileController::tileRevalidationTimerFired
https://bugs.webkit.org/show_bug.cgi?id=131656
<rdar://problem/16583166>
Reviewed by Sam Weinig.
It's possible for the TileController revalidation timer to fire after
the GraphicsLayer has been destroyed, so the PlatformCALayer no longer
has an owningGraphicsLayer.
Bail from the timer callback if owningGraphicsLayer() is null.
Also some drive-by 0 -> nullptr changes.
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::willBeDestroyed):
* platform/graphics/ca/PlatformCALayer.cpp:
(WebCore::PlatformCALayer::~PlatformCALayer):
* platform/graphics/ca/mac/TileController.mm:
(WebCore::TileController::tileRevalidationTimerFired):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacTileControllermm">trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167289 => 167290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-15 02:44:09 UTC (rev 167289)
+++ trunk/Source/WebCore/ChangeLog 2014-04-15 02:54:13 UTC (rev 167290)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-04-14 Simon Fraser <simon.fraser@apple.com>
+
+ Crash in TileController::tileRevalidationTimerFired
+ https://bugs.webkit.org/show_bug.cgi?id=131656
+ <rdar://problem/16583166>
+
+ Reviewed by Sam Weinig.
+
+ It's possible for the TileController revalidation timer to fire after
+ the GraphicsLayer has been destroyed, so the PlatformCALayer no longer
+ has an owningGraphicsLayer.
+
+ Bail from the timer callback if owningGraphicsLayer() is null.
+
+ Also some drive-by 0 -> nullptr changes.
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::willBeDestroyed):
+ * platform/graphics/ca/PlatformCALayer.cpp:
+ (WebCore::PlatformCALayer::~PlatformCALayer):
+ * platform/graphics/ca/mac/TileController.mm:
+ (WebCore::TileController::tileRevalidationTimerFired):
+
</ins><span class="cx"> 2014-04-14 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Remove some leftover shape-inside code
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (167289 => 167290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-04-15 02:44:09 UTC (rev 167289)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-04-15 02:54:13 UTC (rev 167290)
</span><span class="lines">@@ -387,19 +387,19 @@
</span><span class="cx"> // We release our references to the PlatformCALayers here, but do not actively unparent them,
</span><span class="cx"> // since that will cause a commit and break our batched commit model. The layers will
</span><span class="cx"> // get released when the rootmost modified GraphicsLayerCA rebuilds its child layers.
</span><del>-
</del><ins>+
</ins><span class="cx"> // Clean up the layer.
</span><span class="cx"> if (m_layer)
</span><del>- m_layer->setOwner(0);
</del><ins>+ m_layer->setOwner(nullptr);
</ins><span class="cx">
</span><span class="cx"> if (m_contentsLayer)
</span><del>- m_contentsLayer->setOwner(0);
</del><ins>+ m_contentsLayer->setOwner(nullptr);
</ins><span class="cx">
</span><span class="cx"> if (m_contentsClippingLayer)
</span><del>- m_contentsClippingLayer->setOwner(0);
</del><ins>+ m_contentsClippingLayer->setOwner(nullptr);
</ins><span class="cx">
</span><span class="cx"> if (m_structuralLayer)
</span><del>- m_structuralLayer->setOwner(0);
</del><ins>+ m_structuralLayer->setOwner(nullptr);
</ins><span class="cx">
</span><span class="cx"> removeCloneLayers();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp (167289 => 167290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2014-04-15 02:44:09 UTC (rev 167289)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2014-04-15 02:54:13 UTC (rev 167290)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Clear the owner, which also clears it in the delegate to prevent attempts
</span><span class="cx"> // to use the GraphicsLayerCA after it has been destroyed.
</span><del>- setOwner(0);
</del><ins>+ setOwner(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacTileControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm (167289 => 167290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2014-04-15 02:44:09 UTC (rev 167289)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2014-04-15 02:54:13 UTC (rev 167290)
</span><span class="lines">@@ -340,6 +340,9 @@
</span><span class="cx">
</span><span class="cx"> void TileController::tileRevalidationTimerFired(Timer<TileController>*)
</span><span class="cx"> {
</span><ins>+ if (!owningGraphicsLayer())
+ return;
+
</ins><span class="cx"> if (m_isInWindow) {
</span><span class="cx"> setNeedsRevalidateTiles();
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>