<!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>[172235] trunk/Source</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/172235">172235</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-07 13:20:40 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore:
Provide methods to clear undesired references to HistoryItems that have been removed from the back/forard list.
https://bugs.webkit.org/show_bug.cgi?id=135634
<rdar://problem/17388461>
Patch by Gordon Sheridan <gordon_sheridan@apple.com> on 2014-08-07
Reviewed by Brady Eidson.
No new tests. Would require an API test that also needs an httpd, which we don't currently support.
* WebCore.exp.in:
Added export for Page::clearPreviousItemFromAllPages.
* loader/HistoryController.cpp:
(WebCore::HistoryController::clearPreviousItem):
Clear m_previousItem and iterate over children recursively calling clearPreviousItem().
The m_previousItem is cleared for the target HistoryController, and all of its descendents.
* loader/HistoryController.h:
Declared HistoryController::clearPreviousItem.
* page/Page.cpp:
(WebCore::Page::clearPreviousItemFromAllPages):
Iterate over each page in the web process, checking if the previous item of
the HistoryController for the main frame is the same as the item being removed. If so, the
frameTree is traversed and each associated HistoryController has its m_previousItem cleared.
* page/Page.h:
Declared Page::clearPreviousItemFromAllPages.
Source/WebKit2:
Clear the m_previousItem member of HistoryControllers when it matches the HistoryItem being removed.
https://bugs.webkit.org/show_bug.cgi?id=135634
<rdar://problem/17388461>
Patch by Gordon Sheridan <gordon_sheridan@apple.com> on 2014-08-07
Reviewed by Brady Eidson.
* WebProcess/WebPage/WebBackForwardListProxy.cpp:
(WebKit::WebBackForwardListProxy::removeItem):
Call WebCore::Page::clearPreviousItemFromAllPages() for each item removed from
the back/forward list to ensure the page URL is released from IconDatabase.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreloaderHistoryControllercpp">trunk/Source/WebCore/loader/HistoryController.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderHistoryControllerh">trunk/Source/WebCore/loader/HistoryController.h</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebBackForwardListProxycpp">trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172234 => 172235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-07 20:19:13 UTC (rev 172234)
+++ trunk/Source/WebCore/ChangeLog 2014-08-07 20:20:40 UTC (rev 172235)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-08-07 Gordon Sheridan <gordon_sheridan@apple.com>
+
+ Provide methods to clear undesired references to HistoryItems that have been removed from the back/forard list.
+ https://bugs.webkit.org/show_bug.cgi?id=135634
+ <rdar://problem/17388461>
+
+ Reviewed by Brady Eidson.
+
+ No new tests. Would require an API test that also needs an httpd, which we don't currently support.
+
+ * WebCore.exp.in:
+ Added export for Page::clearPreviousItemFromAllPages.
+
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::clearPreviousItem):
+ Clear m_previousItem and iterate over children recursively calling clearPreviousItem().
+ The m_previousItem is cleared for the target HistoryController, and all of its descendents.
+
+ * loader/HistoryController.h:
+ Declared HistoryController::clearPreviousItem.
+
+ * page/Page.cpp:
+ (WebCore::Page::clearPreviousItemFromAllPages):
+ Iterate over each page in the web process, checking if the previous item of
+ the HistoryController for the main frame is the same as the item being removed. If so, the
+ frameTree is traversed and each associated HistoryController has its m_previousItem cleared.
+
+ * page/Page.h:
+ Declared Page::clearPreviousItemFromAllPages.
+
</ins><span class="cx"> 2014-08-07 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix attempt #2 following r172224.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (172234 => 172235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-08-07 20:19:13 UTC (rev 172234)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-08-07 20:20:40 UTC (rev 172235)
</span><span class="lines">@@ -1137,6 +1137,7 @@
</span><span class="cx"> __ZN7WebCore4Page27invalidateStylesForAllLinksEv
</span><span class="cx"> __ZN7WebCore4Page27setVerticalScrollElasticityENS_16ScrollElasticityE
</span><span class="cx"> __ZN7WebCore4Page27setZoomedOutPageScaleFactorEf
</span><ins>+__ZN7WebCore4Page29clearPreviousItemFromAllPagesEPNS_11HistoryItemE
</ins><span class="cx"> __ZN7WebCore4Page29setHorizontalScrollElasticityENS_16ScrollElasticityE
</span><span class="cx"> __ZN7WebCore4Page32setMemoryCacheClientCallsEnabledEb
</span><span class="cx"> __ZN7WebCore4Page33synchronousScrollingReasonsAsTextEv
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/HistoryController.cpp (172234 => 172235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/HistoryController.cpp 2014-08-07 20:19:13 UTC (rev 172234)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2014-08-07 20:20:40 UTC (rev 172235)
</span><span class="lines">@@ -597,6 +597,13 @@
</span><span class="cx"> return m_currentItem && !m_previousItem && equalIgnoringCase(m_currentItem->urlString(), blankURL());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void HistoryController::clearPreviousItem()
+{
+ m_previousItem = nullptr;
+ for (Frame* child = m_frame.tree().firstChild(); child; child = child->tree().nextSibling())
+ child->loader().history().clearPreviousItem();
+}
+
</ins><span class="cx"> void HistoryController::setProvisionalItem(HistoryItem* item)
</span><span class="cx"> {
</span><span class="cx"> m_provisionalItem = item;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderHistoryControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/HistoryController.h (172234 => 172235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/HistoryController.h 2014-08-07 20:19:13 UTC (rev 172234)
+++ trunk/Source/WebCore/loader/HistoryController.h 2014-08-07 20:20:40 UTC (rev 172235)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> void replaceCurrentItem(HistoryItem*);
</span><span class="cx">
</span><span class="cx"> HistoryItem* previousItem() const { return m_previousItem.get(); }
</span><ins>+ void clearPreviousItem();
</ins><span class="cx">
</span><span class="cx"> HistoryItem* provisionalItem() const { return m_provisionalItem.get(); }
</span><span class="cx"> void setProvisionalItem(HistoryItem*);
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (172234 => 172235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-08-07 20:19:13 UTC (rev 172234)
+++ trunk/Source/WebCore/page/Page.cpp 2014-08-07 20:20:40 UTC (rev 172235)
</span><span class="lines">@@ -267,6 +267,20 @@
</span><span class="cx"> m_visitedLinkStore->removePage(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Page::clearPreviousItemFromAllPages(HistoryItem* item)
+{
+ if (!allPages)
+ return;
+
+ for (auto& page : *allPages) {
+ HistoryController& controller = page->mainFrame().loader().history();
+ if (item == controller.previousItem()) {
+ controller.clearPreviousItem();
+ return;
+ }
+ }
+}
+
</ins><span class="cx"> uint64_t Page::renderTreeSize() const
</span><span class="cx"> {
</span><span class="cx"> uint64_t total = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (172234 => 172235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-08-07 20:19:13 UTC (rev 172234)
+++ trunk/Source/WebCore/page/Page.h 2014-08-07 20:20:40 UTC (rev 172235)
</span><span class="lines">@@ -117,6 +117,7 @@
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> static void updateStyleForAllPagesAfterGlobalChangeInEnvironment();
</span><ins>+ static void clearPreviousItemFromAllPages(HistoryItem*);
</ins><span class="cx">
</span><span class="cx"> // It is up to the platform to ensure that non-null clients are provided where required.
</span><span class="cx"> // FIXME: Rename this to PageConfiguration and move it to its own class.
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (172234 => 172235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-07 20:19:13 UTC (rev 172234)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-07 20:20:40 UTC (rev 172235)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-07 Gordon Sheridan <gordon_sheridan@apple.com>
+
+ Clear the m_previousItem member of HistoryControllers when it matches the HistoryItem being removed.
+ https://bugs.webkit.org/show_bug.cgi?id=135634
+ <rdar://problem/17388461>
+
+ Reviewed by Brady Eidson.
+
+ * WebProcess/WebPage/WebBackForwardListProxy.cpp:
+ (WebKit::WebBackForwardListProxy::removeItem):
+ Call WebCore::Page::clearPreviousItemFromAllPages() for each item removed from
+ the back/forward list to ensure the page URL is released from IconDatabase.
+
</ins><span class="cx"> 2014-08-07 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use WebKitNavigationAction also for WebKitNavigationPolicyDecision
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebBackForwardListProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp (172234 => 172235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp 2014-08-07 20:19:13 UTC (rev 172234)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp 2014-08-07 20:20:40 UTC (rev 172235)
</span><span class="lines">@@ -33,7 +33,9 @@
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><ins>+#include <WebCore/HistoryController.h>
</ins><span class="cx"> #include <WebCore/HistoryItem.h>
</span><ins>+#include <WebCore/MainFrame.h>
</ins><span class="cx"> #include <WebCore/PageCache.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -131,6 +133,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> pageCache()->remove(item.get());
</span><ins>+ WebCore::Page::clearPreviousItemFromAllPages(item.get());
</ins><span class="cx"> historyItemToIDMap().remove(item);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>