<!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>[167822] 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/167822">167822</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-04-25 14:28:04 -0700 (Fri, 25 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/167775">r167775</a>): Safari crashes in ViewSnapshotStore::pruneSnapshots after loading 20 pages
https://bugs.webkit.org/show_bug.cgi?id=132204
<rdar://problem/16729123>
Reviewed by Anders Carlsson.
* UIProcess/mac/ViewSnapshotStore.h:
* UIProcess/mac/ViewSnapshotStore.mm:
(WebKit::ViewSnapshotStore::ViewSnapshotStore):
(WebKit::ViewSnapshotStore::pruneSnapshots):
(WebKit::ViewSnapshotStore::recordSnapshot):
Keep track of the number of snapshots that actually have live images; the
size of the snapshot map no longer represents that.
Also, fix the crash by using the UUID from the current item instead of from
the (potentially null) most distant item; <a href="http://trac.webkit.org/projects/webkit/changeset/167775">r167775</a> accidentally typo'd this.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewSnapshotStoreh">trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewSnapshotStoremm">trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167821 => 167822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-25 21:17:45 UTC (rev 167821)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-25 21:28:04 UTC (rev 167822)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-25 Tim Horton <timothy_horton@apple.com>
+
+ REGRESSION (r167775): Safari crashes in ViewSnapshotStore::pruneSnapshots after loading 20 pages
+ https://bugs.webkit.org/show_bug.cgi?id=132204
+ <rdar://problem/16729123>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/mac/ViewSnapshotStore.h:
+ * UIProcess/mac/ViewSnapshotStore.mm:
+ (WebKit::ViewSnapshotStore::ViewSnapshotStore):
+ (WebKit::ViewSnapshotStore::pruneSnapshots):
+ (WebKit::ViewSnapshotStore::recordSnapshot):
+ Keep track of the number of snapshots that actually have live images; the
+ size of the snapshot map no longer represents that.
+ Also, fix the crash by using the UUID from the current item instead of from
+ the (potentially null) most distant item; r167775 accidentally typo'd this.
+
</ins><span class="cx"> 2014-04-25 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Plugin process crashes with GTK2 windowed plugins
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewSnapshotStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h (167821 => 167822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h 2014-04-25 21:17:45 UTC (rev 167821)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h 2014-04-25 21:28:04 UTC (rev 167822)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> HashMap<String, Snapshot> m_snapshotMap;
</span><span class="cx">
</span><span class="cx"> bool m_enabled;
</span><ins>+ unsigned m_snapshotsWithImagesCount;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewSnapshotStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm (167821 => 167822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm 2014-04-25 21:17:45 UTC (rev 167821)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm 2014-04-25 21:28:04 UTC (rev 167822)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> ViewSnapshotStore::ViewSnapshotStore()
</span><span class="cx"> : m_enabled(true)
</span><ins>+ , m_snapshotsWithImagesCount(0)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -55,12 +56,12 @@
</span><span class="cx">
</span><span class="cx"> void ViewSnapshotStore::pruneSnapshots(WebPageProxy& webPageProxy)
</span><span class="cx"> {
</span><del>- if (m_snapshotMap.size() <= maximumSnapshotCount)
</del><ins>+ if (m_snapshotsWithImagesCount <= maximumSnapshotCount)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> uint32_t currentIndex = webPageProxy.backForwardList().currentIndex();
</span><span class="cx"> uint32_t maxDistance = 0;
</span><del>- WebBackForwardListItem* mostDistantSnapshottedItem = nullptr;
</del><ins>+ auto mostDistantSnapshotIter = m_snapshotMap.end();
</ins><span class="cx"> auto backForwardEntries = webPageProxy.backForwardList().entries();
</span><span class="cx">
</span><span class="cx"> // First, try to evict the snapshot for the page farthest from the current back-forward item.
</span><span class="lines">@@ -75,21 +76,21 @@
</span><span class="cx"> if (snapshotUUID.isEmpty())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- const auto& snapshot = m_snapshotMap.find(mostDistantSnapshottedItem->snapshotUUID());
- if (snapshot == m_snapshotMap.end())
</del><ins>+ const auto& snapshotIter = m_snapshotMap.find(snapshotUUID);
+ if (snapshotIter == m_snapshotMap.end())
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // We're only interested in evicting snapshots that still have images.
</span><del>- if (!snapshot->value.hasImage())
</del><ins>+ if (!snapshotIter->value.hasImage())
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- mostDistantSnapshottedItem = item;
</del><ins>+ mostDistantSnapshotIter = snapshotIter;
</ins><span class="cx"> maxDistance = distance;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (mostDistantSnapshottedItem) {
- const auto& snapshot = m_snapshotMap.find(mostDistantSnapshottedItem->snapshotUUID());
- snapshot->value.clearImage();
</del><ins>+ if (mostDistantSnapshotIter != m_snapshotMap.end()) {
+ mostDistantSnapshotIter->value.clearImage();
+ m_snapshotsWithImagesCount--;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -107,6 +108,7 @@
</span><span class="cx">
</span><span class="cx"> const auto& snapshot = m_snapshotMap.find(oldestSnapshotUUID);
</span><span class="cx"> snapshot->value.clearImage();
</span><ins>+ m_snapshotsWithImagesCount--;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(IOSURFACE)
</span><span class="lines">@@ -158,6 +160,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_snapshotMap.add(item->snapshotUUID(), snapshot);
</span><ins>+
+ if (snapshot.hasImage())
+ m_snapshotsWithImagesCount++;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ViewSnapshotStore::getSnapshot(WebBackForwardListItem* item, ViewSnapshotStore::Snapshot& snapshot)
</span></span></pre>
</div>
</div>
</body>
</html>