<!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>[178690] 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/178690">178690</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2015-01-19 19:46:02 -0800 (Mon, 19 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre><https://webkit.org/b/140504> REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/178452">r178452</a>): Visited link coloring only appears to work in the first web process
Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/178452">r178452</a> since it broke visited link coloring.
Reviewed by Anders Carlsson.
* UIProcess/VisitedLinkProvider.cpp:
(WebKit::VisitedLinkProvider::~VisitedLinkProvider):
(WebKit::VisitedLinkProvider::addProcess):
(WebKit::VisitedLinkProvider::removeProcess):
(WebKit::VisitedLinkProvider::removeAll):
(WebKit::VisitedLinkProvider::webProcessWillOpenConnection):
(WebKit::VisitedLinkProvider::webProcessDidCloseConnection):
(WebKit::VisitedLinkProvider::pendingVisitedLinksTimerFired):
(WebKit::VisitedLinkProvider::resizeTable):
* UIProcess/VisitedLinkProvider.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::processDidFinishLaunching):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::disconnect):
(WebKit::WebProcessProxy::addVisitedLinkProvider):
(WebKit::WebProcessProxy::didDestroyVisitedLinkProvider):
* UIProcess/WebProcessProxy.h:</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="#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 (178689 => 178690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-20 03:43:00 UTC (rev 178689)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-20 03:46:02 UTC (rev 178690)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-01-19 Mark Rowe <mrowe@apple.com>
+
+ <https://webkit.org/b/140504> REGRESSION (r178452): Visited link coloring only appears to work in the first web process
+
+ Roll out r178452 since it broke visited link coloring.
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/VisitedLinkProvider.cpp:
+ (WebKit::VisitedLinkProvider::~VisitedLinkProvider):
+ (WebKit::VisitedLinkProvider::addProcess):
+ (WebKit::VisitedLinkProvider::removeProcess):
+ (WebKit::VisitedLinkProvider::removeAll):
+ (WebKit::VisitedLinkProvider::webProcessWillOpenConnection):
+ (WebKit::VisitedLinkProvider::webProcessDidCloseConnection):
+ (WebKit::VisitedLinkProvider::pendingVisitedLinksTimerFired):
+ (WebKit::VisitedLinkProvider::resizeTable):
+ * UIProcess/VisitedLinkProvider.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::processDidFinishLaunching):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::disconnect):
+ (WebKit::WebProcessProxy::addVisitedLinkProvider):
+ (WebKit::WebProcessProxy::didDestroyVisitedLinkProvider):
+ * UIProcess/WebProcessProxy.h:
+
</ins><span class="cx"> 2015-01-19 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Sprinkle some CTTE on API::PolicyClient and API::FormClient
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessVisitedLinkProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp (178689 => 178690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2015-01-20 03:43:00 UTC (rev 178689)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2015-01-20 03:46:02 UTC (rev 178690)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx">
</span><span class="cx"> VisitedLinkProvider::~VisitedLinkProvider()
</span><span class="cx"> {
</span><ins>+ for (WebProcessProxy* process : m_processes)
+ process->didDestroyVisitedLinkProvider(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VisitedLinkProvider::VisitedLinkProvider()
</span><span class="lines">@@ -64,6 +66,31 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void VisitedLinkProvider::addProcess(WebProcessProxy& process)
+{
+ ASSERT(process.state() == WebProcessProxy::State::Running);
+
+ if (!m_processes.add(&process).isNewEntry)
+ return;
+
+ process.addMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier, *this);
+
+ if (!m_keyCount)
+ return;
+
+ ASSERT(m_table.sharedMemory());
+
+ sendTable(process);
+}
+
+void VisitedLinkProvider::removeProcess(WebProcessProxy& process)
+{
+ ASSERT(m_processes.contains(&process));
+
+ m_processes.remove(&process);
+ process.removeMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier);
+}
+
</ins><span class="cx"> void VisitedLinkProvider::addVisitedLinkHash(LinkHash linkHash)
</span><span class="cx"> {
</span><span class="cx"> m_pendingVisitedLinks.add(linkHash);
</span><span class="lines">@@ -80,27 +107,20 @@
</span><span class="cx"> m_tableSize = 0;
</span><span class="cx"> m_table.clear();
</span><span class="cx">
</span><del>- for (WebProcessProxy* process : processes()) {
</del><ins>+ for (WebProcessProxy* process : m_processes) {
</ins><span class="cx"> ASSERT(process->processPool().processes().contains(process));
</span><span class="cx"> process->connection()->send(Messages::VisitedLinkTableController::RemoveAllVisitedLinks(), m_identifier);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void VisitedLinkProvider::webProcessWillOpenConnection(WebProcessProxy& webProcessProxy, IPC::Connection&)
</del><ins>+void VisitedLinkProvider::webProcessWillOpenConnection(WebProcessProxy&, IPC::Connection&)
</ins><span class="cx"> {
</span><del>- webProcessProxy.addMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier, *this);
-
- if (!m_keyCount)
- return;
-
- ASSERT(m_table.sharedMemory());
-
- sendTable(webProcessProxy);
</del><ins>+ // FIXME: Implement.
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void VisitedLinkProvider::webProcessDidCloseConnection(WebProcessProxy& webProcessProxy, IPC::Connection&)
</del><ins>+void VisitedLinkProvider::webProcessDidCloseConnection(WebProcessProxy&, IPC::Connection&)
</ins><span class="cx"> {
</span><del>- webProcessProxy.removeMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier);
</del><ins>+ // FIXME: Implement.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VisitedLinkProvider::addVisitedLinkHashFromPage(uint64_t pageID, LinkHash linkHash)
</span><span class="lines">@@ -168,7 +188,7 @@
</span><span class="cx"> if (addedVisitedLinks.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (WebProcessProxy* process : processes()) {
</del><ins>+ for (WebProcessProxy* process : m_processes) {
</ins><span class="cx"> ASSERT(process->processPool().processes().contains(process));
</span><span class="cx">
</span><span class="cx"> if (addedVisitedLinks.size() > 20)
</span><span class="lines">@@ -219,7 +239,7 @@
</span><span class="cx"> }
</span><span class="cx"> m_pendingVisitedLinks.clear();
</span><span class="cx">
</span><del>- for (WebProcessProxy* process : processes())
</del><ins>+ for (WebProcessProxy* process : m_processes)
</ins><span class="cx"> sendTable(*process);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessVisitedLinkProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h (178689 => 178690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h 2015-01-20 03:43:00 UTC (rev 178689)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h 2015-01-20 03:46:02 UTC (rev 178690)
</span><span class="lines">@@ -47,6 +47,9 @@
</span><span class="cx">
</span><span class="cx"> uint64_t identifier() const { return m_identifier; }
</span><span class="cx">
</span><ins>+ void addProcess(WebProcessProxy&);
+ void removeProcess(WebProcessProxy&);
+
</ins><span class="cx"> void addVisitedLinkHash(WebCore::LinkHash);
</span><span class="cx"> void removeAll();
</span><span class="cx">
</span><span class="lines">@@ -67,8 +70,10 @@
</span><span class="cx"> void resizeTable(unsigned newTableSize);
</span><span class="cx"> void sendTable(WebProcessProxy&);
</span><span class="cx">
</span><del>- const uint64_t m_identifier;
</del><ins>+ HashSet<WebProcessProxy*> m_processes;
</ins><span class="cx">
</span><ins>+ uint64_t m_identifier;
+
</ins><span class="cx"> unsigned m_keyCount;
</span><span class="cx"> unsigned m_tableSize;
</span><span class="cx"> VisitedLinkTable m_table;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (178689 => 178690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-20 03:43:00 UTC (rev 178689)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-20 03:46:02 UTC (rev 178690)
</span><span class="lines">@@ -391,6 +391,7 @@
</span><span class="cx"> if (m_userContentController)
</span><span class="cx"> m_process->addWebUserContentControllerProxy(*m_userContentController);
</span><span class="cx"> m_process->processPool().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, m_process->connection());
</span><ins>+ m_process->addVisitedLinkProvider(m_visitedLinkProvider);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> updateViewState();
</span><span class="lines">@@ -3245,6 +3246,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_userContentController)
</span><span class="cx"> m_process->addWebUserContentControllerProxy(*m_userContentController);
</span><ins>+ m_process->addVisitedLinkProvider(m_visitedLinkProvider);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (178689 => 178690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-01-20 03:43:00 UTC (rev 178689)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-01-20 03:46:02 UTC (rev 178690)
</span><span class="lines">@@ -165,6 +165,10 @@
</span><span class="cx"> if (m_downloadProxyMap)
</span><span class="cx"> m_downloadProxyMap->processDidClose();
</span><span class="cx">
</span><ins>+ for (VisitedLinkProvider* visitedLinkProvider : m_visitedLinkProviders)
+ visitedLinkProvider->removeProcess(*this);
+ m_visitedLinkProviders.clear();
+
</ins><span class="cx"> for (WebUserContentControllerProxy* webUserContentControllerProxy : m_webUserContentControllerProxies)
</span><span class="cx"> webUserContentControllerProxy->removeProcess(*this);
</span><span class="cx"> m_webUserContentControllerProxies.clear();
</span><span class="lines">@@ -228,12 +232,24 @@
</span><span class="cx"> disconnect();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessProxy::addVisitedLinkProvider(VisitedLinkProvider& provider)
+{
+ m_visitedLinkProviders.add(&provider);
+ provider.addProcess(*this);
+}
+
</ins><span class="cx"> void WebProcessProxy::addWebUserContentControllerProxy(WebUserContentControllerProxy& proxy)
</span><span class="cx"> {
</span><span class="cx"> m_webUserContentControllerProxies.add(&proxy);
</span><span class="cx"> proxy.addProcess(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessProxy::didDestroyVisitedLinkProvider(VisitedLinkProvider& provider)
+{
+ ASSERT(m_visitedLinkProviders.contains(&provider));
+ m_visitedLinkProviders.remove(&provider);
+}
+
</ins><span class="cx"> void WebProcessProxy::didDestroyWebUserContentControllerProxy(WebUserContentControllerProxy& proxy)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_webUserContentControllerProxies.contains(&proxy));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (178689 => 178690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-01-20 03:43:00 UTC (rev 178689)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-01-20 03:46:02 UTC (rev 178690)
</span><span class="lines">@@ -88,7 +88,9 @@
</span><span class="cx"> WTF::IteratorRange<WebPageProxyMap::const_iterator::Values> pages() const { return m_pageMap.values(); }
</span><span class="cx"> unsigned pageCount() const { return m_pageMap.size(); }
</span><span class="cx">
</span><ins>+ void addVisitedLinkProvider(VisitedLinkProvider&);
</ins><span class="cx"> void addWebUserContentControllerProxy(WebUserContentControllerProxy&);
</span><ins>+ void didDestroyVisitedLinkProvider(VisitedLinkProvider&);
</ins><span class="cx"> void didDestroyWebUserContentControllerProxy(WebUserContentControllerProxy&);
</span><span class="cx">
</span><span class="cx"> WebBackForwardListItem* webBackForwardItem(uint64_t itemID) const;
</span><span class="lines">@@ -209,6 +211,7 @@
</span><span class="cx"> WebFrameProxyMap m_frameMap;
</span><span class="cx"> WebBackForwardListItemMap m_backForwardListItemMap;
</span><span class="cx">
</span><ins>+ HashSet<VisitedLinkProvider*> m_visitedLinkProviders;
</ins><span class="cx"> HashSet<WebUserContentControllerProxy*> m_webUserContentControllerProxies;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
</span></span></pre>
</div>
</div>
</body>
</html>