<!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>[175349] 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/175349">175349</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-10-29 15:34:14 -0700 (Wed, 29 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clear ViewSnapshots when back/forward list items are removed from their list
https://bugs.webkit.org/show_bug.cgi?id=138188
<rdar://problem/18817001>
Reviewed by Tim Horton.
Ideally we should remove the WebBackForwardListItem objects as well, but this is a somewhat safer fix.
Change all the "remove item" codepaths to call WebBackForwardList::didRemoveItem and have it clear out the snapshot.
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::pageClosed):
(WebKit::WebBackForwardList::addItem):
(WebKit::WebBackForwardList::removeAllItems):
(WebKit::WebBackForwardList::clear):
(WebKit::WebBackForwardList::didRemoveItem):
* UIProcess/WebBackForwardList.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBackForwardListcpp">trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBackForwardListh">trunk/Source/WebKit2/UIProcess/WebBackForwardList.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175348 => 175349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-29 22:01:21 UTC (rev 175348)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-29 22:34:14 UTC (rev 175349)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-10-29 Anders Carlsson <andersca@apple.com>
+
+ Clear ViewSnapshots when back/forward list items are removed from their list
+ https://bugs.webkit.org/show_bug.cgi?id=138188
+ <rdar://problem/18817001>
+
+ Reviewed by Tim Horton.
+
+ Ideally we should remove the WebBackForwardListItem objects as well, but this is a somewhat safer fix.
+
+ Change all the "remove item" codepaths to call WebBackForwardList::didRemoveItem and have it clear out the snapshot.
+
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::WebBackForwardList::pageClosed):
+ (WebKit::WebBackForwardList::addItem):
+ (WebKit::WebBackForwardList::removeAllItems):
+ (WebKit::WebBackForwardList::clear):
+ (WebKit::WebBackForwardList::didRemoveItem):
+ * UIProcess/WebBackForwardList.h:
+
</ins><span class="cx"> 2014-10-29 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Hide the 'Add to Photos' item if it isn't available
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (175348 => 175349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-10-29 22:01:21 UTC (rev 175348)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-10-29 22:34:14 UTC (rev 175349)
</span><span class="lines">@@ -72,7 +72,8 @@
</span><span class="cx"> ASSERT(m_entries[i]);
</span><span class="cx"> if (!m_entries[i])
</span><span class="cx"> continue;
</span><del>- m_page->backForwardRemovedItem(m_entries[i]->itemID());
</del><ins>+
+ didRemoveItem(*m_entries[i]);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -95,7 +96,7 @@
</span><span class="cx"> unsigned targetSize = m_currentIndex + 1;
</span><span class="cx"> removedItems.reserveCapacity(m_entries.size() - targetSize);
</span><span class="cx"> while (m_entries.size() > targetSize) {
</span><del>- m_page->backForwardRemovedItem(m_entries.last()->itemID());
</del><ins>+ didRemoveItem(*m_entries.last());
</ins><span class="cx"> removedItems.append(m_entries.last().release());
</span><span class="cx"> m_entries.removeLast();
</span><span class="cx"> }
</span><span class="lines">@@ -103,7 +104,7 @@
</span><span class="cx"> // Toss the first item if the list is getting too big, as long as we're not using it
</span><span class="cx"> // (or even if we are, if we only want 1 entry).
</span><span class="cx"> if (m_entries.size() == m_capacity && (m_currentIndex || m_capacity == 1)) {
</span><del>- m_page->backForwardRemovedItem(m_entries[0]->itemID());
</del><ins>+ didRemoveItem(*m_entries[0]);
</ins><span class="cx"> removedItems.append(m_entries[0].release());
</span><span class="cx"> m_entries.remove(0);
</span><span class="cx">
</span><span class="lines">@@ -122,7 +123,7 @@
</span><span class="cx"> ASSERT(m_entries[i]);
</span><span class="cx"> if (!m_entries[i])
</span><span class="cx"> continue;
</span><del>- m_page->backForwardRemovedItem(m_entries[i]->itemID());
</del><ins>+ didRemoveItem(*m_entries[i]);
</ins><span class="cx"> removedItems.append(m_entries[i].release());
</span><span class="cx"> }
</span><span class="cx"> m_entries.clear();
</span><span class="lines">@@ -314,7 +315,7 @@
</span><span class="cx"> if (!entry)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- m_page->backForwardRemovedItem(entry->itemID());
</del><ins>+ didRemoveItem(*entry);
</ins><span class="cx"> removedItems.append(WTF::move(entry));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -344,7 +345,7 @@
</span><span class="cx"> if (!m_entries[i])
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- m_page->backForwardRemovedItem(m_entries[i]->itemID());
</del><ins>+ didRemoveItem(*m_entries[i]);
</ins><span class="cx"> removedItems.append(m_entries[i].release());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -358,7 +359,7 @@
</span><span class="cx"> for (size_t i = 0; i < size; ++i) {
</span><span class="cx"> ASSERT(m_entries[i]);
</span><span class="cx"> if (m_entries[i] && m_entries[i] != currentItem)
</span><del>- m_page->backForwardRemovedItem(m_entries[i]->itemID());
</del><ins>+ didRemoveItem(*m_entries[i]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> removedItems.reserveCapacity(size - 1);
</span><span class="lines">@@ -429,4 +430,12 @@
</span><span class="cx"> return itemStates;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebBackForwardList::didRemoveItem(WebBackForwardListItem& backForwardListItem)
+{
+ // FIXME: This should really also delete the item from the map.
+ m_page->backForwardRemovedItem(backForwardListItem.itemID());
+
+ backForwardListItem.setSnapshot(nullptr);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.h (175348 => 175349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-10-29 22:01:21 UTC (rev 175348)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-10-29 22:34:14 UTC (rev 175349)
</span><span class="lines">@@ -80,6 +80,8 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit WebBackForwardList(WebPageProxy&);
</span><span class="cx">
</span><ins>+ void didRemoveItem(WebBackForwardListItem&);
+
</ins><span class="cx"> WebPageProxy* m_page;
</span><span class="cx"> BackForwardListItemVector m_entries;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>