<!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>[182084] 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/182084">182084</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-03-27 15:01:54 -0700 (Fri, 27 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebProcessProxy should not retain WebBackForwardListItems forever.
<https://webkit.org/b/143152>
<rdar://problem/19925709>
Reviewed by Anders Carlsson.
Have WebProcessProxy actually forget about a WebBackForwardListItem after it's removed from
the WebBackForwardList.
This ensures that we don't accumulate too many of these objects, which can get quite large
due to the session state encoded in them.
We already have graceful handling of the case where an incoming IPC message references
a removed back/forward list item.
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::didRemoveItem):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::backForwardRemovedItem):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::removeBackForwardItem):
* UIProcess/WebProcessProxy.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="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182083 => 182084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-27 21:56:35 UTC (rev 182083)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-27 22:01:54 UTC (rev 182084)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-03-27 Andreas Kling <akling@apple.com>
+
+ WebProcessProxy should not retain WebBackForwardListItems forever.
+ <https://webkit.org/b/143152>
+ <rdar://problem/19925709>
+
+ Reviewed by Anders Carlsson.
+
+ Have WebProcessProxy actually forget about a WebBackForwardListItem after it's removed from
+ the WebBackForwardList.
+
+ This ensures that we don't accumulate too many of these objects, which can get quite large
+ due to the session state encoded in them.
+
+ We already have graceful handling of the case where an incoming IPC message references
+ a removed back/forward list item.
+
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::WebBackForwardList::didRemoveItem):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::backForwardRemovedItem):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::removeBackForwardItem):
+ * UIProcess/WebProcessProxy.h:
+
</ins><span class="cx"> 2015-03-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Use the correct timebase to log scrollperf blank pixel counts on iOS
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (182083 => 182084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2015-03-27 21:56:35 UTC (rev 182083)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2015-03-27 22:01:54 UTC (rev 182084)
</span><span class="lines">@@ -436,7 +436,6 @@
</span><span class="cx">
</span><span class="cx"> void WebBackForwardList::didRemoveItem(WebBackForwardListItem& backForwardListItem)
</span><span class="cx"> {
</span><del>- // FIXME: This should really also delete the item from the map.
</del><span class="cx"> m_page->backForwardRemovedItem(backForwardListItem.itemID());
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (182083 => 182084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-03-27 21:56:35 UTC (rev 182083)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-03-27 22:01:54 UTC (rev 182084)
</span><span class="lines">@@ -5125,6 +5125,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::backForwardRemovedItem(uint64_t itemID)
</span><span class="cx"> {
</span><ins>+ m_process->removeBackForwardItem(itemID);
</ins><span class="cx"> m_process->send(Messages::WebPage::DidRemoveBackForwardItem(itemID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (182083 => 182084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-03-27 21:56:35 UTC (rev 182083)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-03-27 22:01:54 UTC (rev 182084)
</span><span class="lines">@@ -292,6 +292,11 @@
</span><span class="cx"> m_backForwardListItemMap.set(item->itemID(), item);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessProxy::removeBackForwardItem(uint64_t itemID)
+{
+ m_backForwardListItemMap.remove(itemID);
+}
+
</ins><span class="cx"> void WebProcessProxy::assumeReadAccessToBaseURL(const String& urlString)
</span><span class="cx"> {
</span><span class="cx"> URL url(URL(), urlString);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (182083 => 182084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-03-27 21:56:35 UTC (rev 182083)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-03-27 22:01:54 UTC (rev 182084)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx"> void updateTextCheckerState();
</span><span class="cx">
</span><span class="cx"> void registerNewWebBackForwardListItem(WebBackForwardListItem*);
</span><ins>+ void removeBackForwardItem(uint64_t);
</ins><span class="cx">
</span><span class="cx"> void willAcquireUniversalFileReadSandboxExtension() { m_mayHaveUniversalFileReadSandboxExtension = true; }
</span><span class="cx"> void assumeReadAccessToBaseURL(const String&);
</span></span></pre>
</div>
</div>
</body>
</html>