<!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>[173121] 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/173121">173121</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-08-29 14:38:12 -0700 (Fri, 29 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More occasional crashes in ServicesController::resfreshExistingServices
https://bugs.webkit.org/show_bug.cgi?id=136387
<rdar://problem/18167200>
Patch by Tim Horton <timothy_horton@apple.com> on 2014-08-29
Reviewed by Dan Bernstein.
* UIProcess/mac/ServicesController.mm:
(WebKit::ServicesController::ServicesController):
Speculative fix; if this block is called synchronously, we'll end up
calling back into ::shared() before the NeverDestroyed is initialized,
ending up with two ServicesControllers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxycpp">trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxyh">trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h</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 (173120 => 173121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-29 21:33:30 UTC (rev 173120)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-29 21:38:12 UTC (rev 173121)
</span><span class="lines">@@ -14,6 +14,52 @@
</span><span class="cx">
</span><span class="cx"> 2014-08-29 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><ins>+ Crashes in IPC code under VisitedLinkProvider::pendingVisitedLinksTimerFired
+ https://bugs.webkit.org/show_bug.cgi?id=136384
+ rdar://problem/16991213
+
+ Reviewed by Sam Weinig.
+
+ VisitedLinkProvider process tracking relied on a combination of WebPageProxy process
+ lifecycle notifications and checking process state. As evidenced by multiple FIXMEs,
+ these are not yet as reliable as they should be.
+
+ Changed to unregister a process when it closes, not when it no longer has any pages
+ using the particular VisitedLinkProvider or WebUserContentControllerProxy. This
+ is a deoptimization that should not matter in practice.
+
+ * UIProcess/UserContent/WebUserContentControllerProxy.cpp:
+ (WebKit::WebUserContentControllerProxy::~WebUserContentControllerProxy):
+ (WebKit::WebUserContentControllerProxy::removeProcess):
+ (WebKit::WebUserContentControllerProxy::addUserScript):
+ (WebKit::WebUserContentControllerProxy::removeAllUserScripts):
+ (WebKit::WebUserContentControllerProxy::addUserStyleSheet):
+ (WebKit::WebUserContentControllerProxy::removeAllUserStyleSheets):
+ (WebKit::WebUserContentControllerProxy::addUserScriptMessageHandler):
+ (WebKit::WebUserContentControllerProxy::removeUserMessageHandlerForName):
+ * UIProcess/UserContent/WebUserContentControllerProxy.h:
+ * UIProcess/VisitedLinkProvider.cpp:
+ (WebKit::VisitedLinkProvider::~VisitedLinkProvider):
+ (WebKit::VisitedLinkProvider::removeProcess):
+ (WebKit::VisitedLinkProvider::removeAll):
+ (WebKit::VisitedLinkProvider::pendingVisitedLinksTimerFired):
+ (WebKit::VisitedLinkProvider::resizeTable):
+ * UIProcess/VisitedLinkProvider.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::close):
+ (WebKit::WebPageProxy::processDidFinishLaunching):
+ (WebKit::WebPageProxy::resetStateAfterProcessExited):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::disconnect):
+ (WebKit::WebProcessProxy::addVisitedLinkProvider):
+ (WebKit::WebProcessProxy::addWebUserContentControllerProxy):
+ (WebKit::WebProcessProxy::didDestroyVisitedLinkProvider):
+ (WebKit::WebProcessProxy::didDestroyWebUserContentControllerProxy):
+ * UIProcess/WebProcessProxy.h:
+
+2014-08-29 Alexey Proskuryakov <ap@apple.com>
+
</ins><span class="cx"> WebPageProxy::close() is a no-op for terminated processes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136378
</span><span class="cx"> Related to <rdar://problem/16991213> and to <rdar://problem/17095600>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp (173120 => 173121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2014-08-29 21:33:30 UTC (rev 173120)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2014-08-29 21:38:12 UTC (rev 173121)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx">
</span><span class="cx"> WebUserContentControllerProxy::~WebUserContentControllerProxy()
</span><span class="cx"> {
</span><ins>+ for (WebProcessProxy* process : m_processes)
+ process->didDestroyWebUserContentControllerProxy(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebUserContentControllerProxy::addProcess(WebProcessProxy& webProcessProxy)
</span><span class="lines">@@ -78,40 +80,40 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_processes.contains(&webProcessProxy));
</span><span class="cx">
</span><del>- if (m_processes.remove(&webProcessProxy))
- webProcessProxy.removeMessageReceiver(Messages::WebUserContentControllerProxy::messageReceiverName(), m_identifier);
</del><ins>+ m_processes.remove(&webProcessProxy);
+ webProcessProxy.removeMessageReceiver(Messages::WebUserContentControllerProxy::messageReceiverName(), m_identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebUserContentControllerProxy::addUserScript(WebCore::UserScript userScript)
</span><span class="cx"> {
</span><span class="cx"> m_userScripts.append(WTF::move(userScript));
</span><span class="cx">
</span><del>- for (auto& processAndCount : m_processes)
- processAndCount.key->connection()->send(Messages::WebUserContentController::AddUserScripts({ m_userScripts.last() }), m_identifier);
</del><ins>+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::AddUserScripts({ m_userScripts.last() }), m_identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebUserContentControllerProxy::removeAllUserScripts()
</span><span class="cx"> {
</span><span class="cx"> m_userScripts.clear();
</span><span class="cx">
</span><del>- for (auto& processAndCount : m_processes)
- processAndCount.key->connection()->send(Messages::WebUserContentController::RemoveAllUserScripts(), m_identifier);
</del><ins>+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::RemoveAllUserScripts(), m_identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebUserContentControllerProxy::addUserStyleSheet(WebCore::UserStyleSheet userStyleSheet)
</span><span class="cx"> {
</span><span class="cx"> m_userStyleSheets.append(WTF::move(userStyleSheet));
</span><span class="cx">
</span><del>- for (auto& processAndCount : m_processes)
- processAndCount.key->connection()->send(Messages::WebUserContentController::AddUserStyleSheets({ m_userStyleSheets.last() }), m_identifier);
</del><ins>+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::AddUserStyleSheets({ m_userStyleSheets.last() }), m_identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebUserContentControllerProxy::removeAllUserStyleSheets()
</span><span class="cx"> {
</span><span class="cx"> m_userStyleSheets.clear();
</span><span class="cx">
</span><del>- for (auto& processAndCount : m_processes)
- processAndCount.key->connection()->send(Messages::WebUserContentController::RemoveAllUserStyleSheets(), m_identifier);
</del><ins>+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::RemoveAllUserStyleSheets(), m_identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebUserContentControllerProxy::addUserScriptMessageHandler(WebScriptMessageHandler* handler)
</span><span class="lines">@@ -123,8 +125,8 @@
</span><span class="cx">
</span><span class="cx"> m_scriptMessageHandlers.add(handler->identifier(), handler);
</span><span class="cx">
</span><del>- for (auto& processAndCount : m_processes)
- processAndCount.key->connection()->send(Messages::WebUserContentController::AddUserScriptMessageHandlers({ handler->handle() }), m_identifier);
</del><ins>+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::AddUserScriptMessageHandlers({ handler->handle() }), m_identifier);
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -133,8 +135,8 @@
</span><span class="cx"> {
</span><span class="cx"> for (auto it = m_scriptMessageHandlers.begin(), end = m_scriptMessageHandlers.end(); it != end; ++it) {
</span><span class="cx"> if (it->value->name() == name) {
</span><del>- for (auto& processAndCount : m_processes)
- processAndCount.key->connection()->send(Messages::WebUserContentController::RemoveUserScriptMessageHandler(it->value->identifier()), m_identifier);
</del><ins>+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::RemoveUserScriptMessageHandler(it->value->identifier()), m_identifier);
</ins><span class="cx"> m_scriptMessageHandlers.remove(it);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h (173120 => 173121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h 2014-08-29 21:33:30 UTC (rev 173120)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h 2014-08-29 21:38:12 UTC (rev 173121)
</span><span class="lines">@@ -28,10 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/HashCountedSet.h>
</del><span class="cx"> #include <wtf/HashMap.h>
</span><ins>+#include <wtf/HashSet.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><ins>+#include <wtf/Vector.h>
</ins><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx"> class DataReference;
</span><span class="lines">@@ -76,7 +77,7 @@
</span><span class="cx"> void didPostMessage(IPC::Connection*, uint64_t pageID, uint64_t frameID, uint64_t messageHandlerID, const IPC::DataReference&);
</span><span class="cx">
</span><span class="cx"> uint64_t m_identifier;
</span><del>- HashCountedSet<WebProcessProxy*> m_processes;
</del><ins>+ HashSet<WebProcessProxy*> m_processes;
</ins><span class="cx">
</span><span class="cx"> Vector<WebCore::UserScript> m_userScripts;
</span><span class="cx"> Vector<WebCore::UserStyleSheet> m_userStyleSheets;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessVisitedLinkProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp (173120 => 173121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2014-08-29 21:33:30 UTC (rev 173120)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2014-08-29 21:38:12 UTC (rev 173121)
</span><span class="lines">@@ -53,7 +53,8 @@
</span><span class="cx">
</span><span class="cx"> VisitedLinkProvider::~VisitedLinkProvider()
</span><span class="cx"> {
</span><del>- ASSERT(m_processes.isEmpty());
</del><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">@@ -85,8 +86,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_processes.contains(&process));
</span><span class="cx">
</span><del>- if (m_processes.remove(&process))
- process.removeMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier);
</del><ins>+ m_processes.remove(&process);
+ process.removeMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VisitedLinkProvider::removeAll()
</span><span class="lines">@@ -97,8 +98,7 @@
</span><span class="cx"> m_tableSize = 0;
</span><span class="cx"> m_table.clear();
</span><span class="cx">
</span><del>- for (auto& processAndCount : m_processes) {
- WebProcessProxy* process = processAndCount.key;
</del><ins>+ for (WebProcessProxy* process : m_processes) {
</ins><span class="cx"> ASSERT(process->context().processes().contains(process));
</span><span class="cx"> process->connection()->send(Messages::VisitedLinkTableController::RemoveAllVisitedLinks(), m_identifier);
</span><span class="cx"> }
</span><span class="lines">@@ -177,8 +177,7 @@
</span><span class="cx"> if (addedVisitedLinks.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (auto& processAndCount : m_processes) {
- WebProcessProxy* process = processAndCount.key;
</del><ins>+ for (WebProcessProxy* process : m_processes) {
</ins><span class="cx"> ASSERT(process->context().processes().contains(process));
</span><span class="cx">
</span><span class="cx"> if (addedVisitedLinks.size() > 20)
</span><span class="lines">@@ -229,8 +228,8 @@
</span><span class="cx"> }
</span><span class="cx"> m_pendingVisitedLinks.clear();
</span><span class="cx">
</span><del>- for (auto& processAndCount : m_processes)
- sendTable(*processAndCount.key);
</del><ins>+ for (WebProcessProxy* process : m_processes)
+ sendTable(*process);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VisitedLinkProvider::sendTable(WebProcessProxy& process)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessVisitedLinkProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h (173120 => 173121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h 2014-08-29 21:33:30 UTC (rev 173120)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h 2014-08-29 21:38:12 UTC (rev 173121)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "VisitedLinkTable.h"
</span><span class="cx"> #include <WebCore/LinkHash.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/HashCountedSet.h>
</del><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">@@ -67,7 +66,7 @@
</span><span class="cx"> void resizeTable(unsigned newTableSize);
</span><span class="cx"> void sendTable(WebProcessProxy&);
</span><span class="cx">
</span><del>- HashCountedSet<WebProcessProxy*> m_processes;
</del><ins>+ HashSet<WebProcessProxy*> m_processes;
</ins><span class="cx">
</span><span class="cx"> uint64_t m_identifier;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (173120 => 173121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-08-29 21:33:30 UTC (rev 173120)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-08-29 21:38:12 UTC (rev 173121)
</span><span class="lines">@@ -373,8 +373,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_process->state() == WebProcessProxy::State::Running) {
</span><span class="cx"> if (m_userContentController)
</span><del>- m_userContentController->addProcess(m_process.get());
- m_visitedLinkProvider->addProcess(m_process.get());
</del><ins>+ m_process->addWebUserContentControllerProxy(*m_userContentController);
+ m_process->addVisitedLinkProvider(m_visitedLinkProvider.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> updateViewState();
</span><span class="lines">@@ -662,12 +662,6 @@
</span><span class="cx">
</span><span class="cx"> m_isClosed = true;
</span><span class="cx">
</span><del>- if (m_process->state() == WebProcessProxy::State::Running) {
- if (m_userContentController)
- m_userContentController->removeProcess(m_process.get());
- m_visitedLinkProvider->removeProcess(m_process.get());
- }
-
</del><span class="cx"> m_backForwardList->pageClosed();
</span><span class="cx"> m_pageClient.pageClosed();
</span><span class="cx">
</span><span class="lines">@@ -3143,8 +3137,8 @@
</span><span class="cx"> ASSERT(m_process->state() == WebProcessProxy::State::Running);
</span><span class="cx">
</span><span class="cx"> if (m_userContentController)
</span><del>- m_userContentController->addProcess(m_process.get());
- m_visitedLinkProvider->addProcess(m_process.get());
</del><ins>+ m_process->addWebUserContentControllerProxy(*m_userContentController);
+ m_process->addVisitedLinkProvider(m_visitedLinkProvider.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="lines">@@ -4462,12 +4456,6 @@
</span><span class="cx"> // FIXME: It's weird that resetStateAfterProcessExited() is called even though the process is launching.
</span><span class="cx"> ASSERT(m_process->state() == WebProcessProxy::State::Launching || m_process->state() == WebProcessProxy::State::Terminated);
</span><span class="cx">
</span><del>- if (m_process->state() == WebProcessProxy::State::Terminated) {
- if (m_userContentController)
- m_userContentController->removeProcess(m_process.get());
- m_visitedLinkProvider->removeProcess(m_process.get());
- }
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_activityToken = nullptr;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (173120 => 173121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-08-29 21:33:30 UTC (rev 173120)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-08-29 21:38:12 UTC (rev 173121)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "TextChecker.h"
</span><span class="cx"> #include "TextCheckerState.h"
</span><span class="cx"> #include "UserData.h"
</span><ins>+#include "WebUserContentControllerProxy.h"
</ins><span class="cx"> #include "WebBackForwardListItem.h"
</span><span class="cx"> #include "WebContext.h"
</span><span class="cx"> #include "WebNavigationDataStore.h"
</span><span class="lines">@@ -162,6 +163,14 @@
</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();
+
+ for (WebUserContentControllerProxy* webUserContentControllerProxy : m_webUserContentControllerProxies)
+ webUserContentControllerProxy->removeProcess(*this);
+ m_webUserContentControllerProxies.clear();
+
</ins><span class="cx"> m_context->disconnectProcess(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -234,6 +243,30 @@
</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);
+}
+
+void WebProcessProxy::addWebUserContentControllerProxy(WebUserContentControllerProxy& proxy)
+{
+ m_webUserContentControllerProxies.add(&proxy);
+ proxy.addProcess(*this);
+}
+
+void WebProcessProxy::didDestroyVisitedLinkProvider(VisitedLinkProvider& provider)
+{
+ ASSERT(m_visitedLinkProviders.contains(&provider));
+ m_visitedLinkProviders.remove(&provider);
+}
+
+void WebProcessProxy::didDestroyWebUserContentControllerProxy(WebUserContentControllerProxy& proxy)
+{
+ ASSERT(m_webUserContentControllerProxies.contains(&proxy));
+ m_webUserContentControllerProxies.remove(&proxy);
+}
+
</ins><span class="cx"> WebBackForwardListItem* WebProcessProxy::webBackForwardItem(uint64_t itemID) const
</span><span class="cx"> {
</span><span class="cx"> return m_backForwardListItemMap.get(itemID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (173120 => 173121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-08-29 21:33:30 UTC (rev 173120)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-08-29 21:38:12 UTC (rev 173121)
</span><span class="lines">@@ -90,6 +90,11 @@
</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&);
+ void addWebUserContentControllerProxy(WebUserContentControllerProxy&);
+ void didDestroyVisitedLinkProvider(VisitedLinkProvider&);
+ void didDestroyWebUserContentControllerProxy(WebUserContentControllerProxy&);
+
</ins><span class="cx"> WebBackForwardListItem* webBackForwardItem(uint64_t itemID) const;
</span><span class="cx">
</span><span class="cx"> ResponsivenessTimer* responsivenessTimer() { return &m_responsivenessTimer; }
</span><span class="lines">@@ -214,6 +219,9 @@
</span><span class="cx"> WebFrameProxyMap m_frameMap;
</span><span class="cx"> WebBackForwardListItemMap m_backForwardListItemMap;
</span><span class="cx">
</span><ins>+ HashSet<VisitedLinkProvider*> m_visitedLinkProviders;
+ HashSet<WebUserContentControllerProxy*> m_webUserContentControllerProxies;
+
</ins><span class="cx"> std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CUSTOM_PROTOCOLS)
</span></span></pre>
</div>
</div>
</body>
</html>