<!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>[164877] trunk</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/164877">164877</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-28 11:32:11 -0800 (Fri, 28 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebKit2: VisitedLinkProvider should keep track of processes, not pages
https://bugs.webkit.org/show_bug.cgi?id=129497
Reviewed by Dan Bernstein.
Use a counted set of WebProcessProxy pointers instead of a set of pages.
* UIProcess/VisitedLinkProvider.cpp:
(WebKit::VisitedLinkProvider::~VisitedLinkProvider):
Assert that m_processes is null.
(WebKit::VisitedLinkProvider::addProcess):
Add the process to the set.
(WebKit::VisitedLinkProvider::removeProcess):
Remove the process from the set.
* UIProcess/VisitedLinkProvider.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
If our process is currently running, add it to the visited link provider.
Otherwise it will be added in connectionWillOpen.
(WebKit::WebPageProxy::close):
If our process is running, remove it from the visited link provider.
Otherwise it's either crashed or not yet launched and will not have been added.
(WebKit::WebPageProxy::connectionWillOpen):
Add the process to the visited link provider.
(WebKit::WebPageProxy::resetStateAfterProcessExited):
Remove the process from the visited link provider.
Tools: Remove logging.
Reviewed by Dan Bernstein.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController browsingContextController:decidePolicyForNavigationAction:decisionHandler:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessVisitedLinkProvidercpp">trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessVisitedLinkProviderh">trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164876 => 164877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-28 19:19:03 UTC (rev 164876)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-28 19:32:11 UTC (rev 164877)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-02-28 Anders Carlsson <andersca@apple.com>
+
+ VisitedLinkProvider should keep track of processes, not pages
+ https://bugs.webkit.org/show_bug.cgi?id=129497
+
+ Reviewed by Dan Bernstein.
+
+ Use a counted set of WebProcessProxy pointers instead of a set of pages.
+
+ * UIProcess/VisitedLinkProvider.cpp:
+ (WebKit::VisitedLinkProvider::~VisitedLinkProvider):
+ Assert that m_processes is null.
+
+ (WebKit::VisitedLinkProvider::addProcess):
+ Add the process to the set.
+
+ (WebKit::VisitedLinkProvider::removeProcess):
+ Remove the process from the set.
+
+ * UIProcess/VisitedLinkProvider.h:
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ If our process is currently running, add it to the visited link provider.
+ Otherwise it will be added in connectionWillOpen.
+
+ (WebKit::WebPageProxy::close):
+ If our process is running, remove it from the visited link provider.
+ Otherwise it's either crashed or not yet launched and will not have been added.
+
+ (WebKit::WebPageProxy::connectionWillOpen):
+ Add the process to the visited link provider.
+
+ (WebKit::WebPageProxy::resetStateAfterProcessExited):
+ Remove the process from the visited link provider.
+
</ins><span class="cx"> 2014-02-27 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Stop using some deprecated functions in WKView.mm
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessVisitedLinkProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp (164876 => 164877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2014-02-28 19:19:03 UTC (rev 164876)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2014-02-28 19:32:11 UTC (rev 164877)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> VisitedLinkProvider::~VisitedLinkProvider()
</span><span class="cx"> {
</span><del>- ASSERT(m_pages.isEmpty());
</del><ins>+ ASSERT(m_processes.isEmpty());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VisitedLinkProvider::VisitedLinkProvider()
</span><span class="lines">@@ -62,16 +62,18 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void VisitedLinkProvider::addPage(WebPageProxy& webPageProxy)
</del><ins>+void VisitedLinkProvider::addProcess(WebProcessProxy& process)
</ins><span class="cx"> {
</span><del>- ASSERT(!m_pages.contains(&webPageProxy));
- m_pages.add(&webPageProxy);
</del><ins>+ ASSERT(process.state() == WebProcessProxy::State::Running);
+
+ m_processes.add(&process);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void VisitedLinkProvider::removePage(WebPageProxy& webPageProxy)
</del><ins>+void VisitedLinkProvider::removeProcess(WebProcessProxy& process)
</ins><span class="cx"> {
</span><del>- ASSERT(m_pages.contains(&webPageProxy));
- m_pages.remove(&webPageProxy);
</del><ins>+ ASSERT(m_processes.contains(&process));
+
+ m_processes.remove(&process);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VisitedLinkProvider::processDidFinishLaunching(WebProcessProxy* process)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessVisitedLinkProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h (164876 => 164877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h 2014-02-28 19:19:03 UTC (rev 164876)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h 2014-02-28 19:32:11 UTC (rev 164877)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "VisitedLinkTable.h"
</span><span class="cx"> #include <WebCore/LinkHash.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/HashCountedSet.h>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="lines">@@ -46,8 +47,8 @@
</span><span class="cx">
</span><span class="cx"> uint64_t identifier() const { return m_identifier; }
</span><span class="cx">
</span><del>- void addPage(WebPageProxy&);
- void removePage(WebPageProxy&);
</del><ins>+ void addProcess(WebProcessProxy&);
+ void removeProcess(WebProcessProxy&);
</ins><span class="cx">
</span><span class="cx"> void addVisitedLink(WebCore::LinkHash);
</span><span class="cx">
</span><span class="lines">@@ -59,11 +60,12 @@
</span><span class="cx">
</span><span class="cx"> void pendingVisitedLinksTimerFired();
</span><span class="cx">
</span><ins>+ HashCountedSet<WebProcessProxy*> m_processes;
+
</ins><span class="cx"> HashSet<WebProcessProxy*> m_processesWithVisitedLinkState;
</span><span class="cx"> HashSet<WebProcessProxy*> m_processesWithoutVisitedLinkState;
</span><span class="cx">
</span><span class="cx"> uint64_t m_identifier;
</span><del>- HashSet<WebPageProxy*> m_pages;
</del><span class="cx">
</span><span class="cx"> unsigned m_keyCount;
</span><span class="cx"> unsigned m_tableSize;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (164876 => 164877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-28 19:19:03 UTC (rev 164876)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-28 19:32:11 UTC (rev 164877)
</span><span class="lines">@@ -336,7 +336,8 @@
</span><span class="cx"> , m_scrollPinningBehavior(DoNotPin)
</span><span class="cx"> , m_navigationID(0)
</span><span class="cx"> {
</span><del>- m_visitedLinkProvider->addPage(*this);
</del><ins>+ if (m_process->state() == WebProcessProxy::State::Running)
+ m_visitedLinkProvider->addProcess(m_process.get());
</ins><span class="cx">
</span><span class="cx"> updateViewState();
</span><span class="cx">
</span><span class="lines">@@ -575,7 +576,8 @@
</span><span class="cx">
</span><span class="cx"> m_isClosed = true;
</span><span class="cx">
</span><del>- m_visitedLinkProvider->removePage(*this);
</del><ins>+ if (m_process->state() == WebProcessProxy::State::Running)
+ m_visitedLinkProvider->removeProcess(m_process.get());
</ins><span class="cx">
</span><span class="cx"> m_backForwardList->pageClosed();
</span><span class="cx"> m_pageClient.pageClosed();
</span><span class="lines">@@ -2696,6 +2698,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(connection == m_process->connection());
</span><span class="cx">
</span><ins>+ m_visitedLinkProvider->addProcess(m_process.get());
+
</ins><span class="cx"> m_process->context().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, connection);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3908,6 +3912,8 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ m_visitedLinkProvider->removeProcess(m_process.get());
+
</ins><span class="cx"> m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID);
</span><span class="cx">
</span><span class="cx"> m_isValid = false;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (164876 => 164877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-28 19:19:03 UTC (rev 164876)
+++ trunk/Tools/ChangeLog 2014-02-28 19:32:11 UTC (rev 164877)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-02-28 Anders Carlsson <andersca@apple.com>
+
+ Remove logging.
+
+ Reviewed by Dan Bernstein.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController browsingContextController:decidePolicyForNavigationAction:decisionHandler:]):
+
</ins><span class="cx"> 2014-02-28 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] DumpRenderTree Perl Support may build against wrong SDK and toolchain
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (164876 => 164877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-02-28 19:19:03 UTC (rev 164876)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-02-28 19:32:11 UTC (rev 164877)
</span><span class="lines">@@ -673,7 +673,6 @@
</span><span class="cx"> - (void)browsingContextController:(WKBrowsingContextController *)browsingContext decidePolicyForNavigationAction:(NSDictionary *)actionInformation decisionHandler:(WKPolicyDecisionHandler)decisionHandler
</span><span class="cx"> {
</span><span class="cx"> LOG(@"decidePolicyForNavigationAction");
</span><del>- NSLog(@"action information %@", actionInformation);
</del><span class="cx"> decisionHandler(WKPolicyDecisionAllow);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>