<!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>[178461] 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/178461">178461</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-14 16:01:05 -0800 (Wed, 14 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make WebsiteDataStore a WebProcessLifetimeObserver
https://bugs.webkit.org/show_bug.cgi?id=140472
Reviewed by Andreas Kling.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::~WebsiteDataStore):
(WebKit::WebsiteDataStore::removeData):
(WebKit::WebsiteDataStore::addWebPage): Deleted.
(WebKit::WebsiteDataStore::removeWebPage): Deleted.
* UIProcess/WebsiteData/WebsiteDataStore.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178460 => 178461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-01-14 23:55:25 UTC (rev 178460)
+++ trunk/Source/WebKit2/ChangeLog        2015-01-15 00:01:05 UTC (rev 178461)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-14 Anders Carlsson <andersca@apple.com>
+
+ Make WebsiteDataStore a WebProcessLifetimeObserver
+ https://bugs.webkit.org/show_bug.cgi?id=140472
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::~WebsiteDataStore):
+ (WebKit::WebsiteDataStore::removeData):
+ (WebKit::WebsiteDataStore::addWebPage): Deleted.
+ (WebKit::WebsiteDataStore::removeWebPage): Deleted.
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+
</ins><span class="cx"> 2015-01-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][iOS] Add private API to toggle diagnostic logging setting
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (178460 => 178461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2015-01-14 23:55:25 UTC (rev 178460)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2015-01-15 00:01:05 UTC (rev 178461)
</span><span class="lines">@@ -381,9 +381,8 @@
</span><span class="cx"> , m_isPlayingAudio(false)
</span><span class="cx"> {
</span><span class="cx"> m_webProcessLifetimeTracker.addObserver(m_visitedLinkProvider);
</span><ins>+ m_webProcessLifetimeTracker.addObserver(m_websiteDataStore);
</ins><span class="cx">
</span><del>- m_websiteDataStore->addWebPage(*this);
-
</del><span class="cx"> if (m_process->state() == WebProcessProxy::State::Running) {
</span><span class="cx"> if (m_userContentController)
</span><span class="cx"> m_process->addWebUserContentControllerProxy(*m_userContentController);
</span><span class="lines">@@ -716,8 +715,6 @@
</span><span class="cx"> m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID);
</span><span class="cx"> m_process->processPool().storageManager().destroySessionStorageNamespace(m_pageID);
</span><span class="cx"> m_process->processPool().supplement<WebNotificationManagerProxy>()->clearNotifications(this);
</span><del>-
- m_websiteDataStore->removeWebPage(*this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPageProxy::tryClose()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (178460 => 178461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp        2015-01-14 23:55:25 UTC (rev 178460)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp        2015-01-15 00:01:05 UTC (rev 178461)
</span><span class="lines">@@ -70,23 +70,8 @@
</span><span class="cx">
</span><span class="cx"> WebsiteDataStore::~WebsiteDataStore()
</span><span class="cx"> {
</span><del>- ASSERT(m_webPages.isEmpty());
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void WebsiteDataStore::addWebPage(WebPageProxy& webPageProxy)
-{
- ASSERT(!m_webPages.contains(&webPageProxy));
-
- m_webPages.add(&webPageProxy);
-}
-
-void WebsiteDataStore::removeWebPage(WebPageProxy& webPageProxy)
-{
- ASSERT(m_webPages.contains(&webPageProxy));
-
- m_webPages.remove(&webPageProxy);
-}
-
</del><span class="cx"> enum class ProcessAccessType {
</span><span class="cx"> None,
</span><span class="cx"> OnlyIfLaunched,
</span><span class="lines">@@ -146,8 +131,8 @@
</span><span class="cx"> auto networkProcessAccessType = computeNetworkProcessAccessType(dataTypes, isNonPersistent());
</span><span class="cx"> if (networkProcessAccessType != ProcessAccessType::None) {
</span><span class="cx"> HashSet<WebProcessPool*> processPools;
</span><del>- for (auto& webPage : m_webPages)
- processPools.add(&webPage->process().processPool());
</del><ins>+ for (auto& process : processes())
+ processPools.add(&process->processPool());
</ins><span class="cx">
</span><span class="cx"> for (auto& processPool : processPools) {
</span><span class="cx"> switch (networkProcessAccessType) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (178460 => 178461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h        2015-01-14 23:55:25 UTC (rev 178460)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h        2015-01-15 00:01:05 UTC (rev 178461)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef WebsiteDataStore_h
</span><span class="cx"> #define WebsiteDataStore_h
</span><span class="cx">
</span><ins>+#include "WebProcessLifetimeObserver.h"
</ins><span class="cx"> #include "WebsiteDataTypes.h"
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <functional>
</span><span class="lines">@@ -37,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> class WebPageProxy;
</span><span class="cx">
</span><del>-class WebsiteDataStore : public RefCounted<WebsiteDataStore> {
</del><ins>+class WebsiteDataStore : public RefCounted<WebsiteDataStore>, public WebProcessLifetimeObserver {
</ins><span class="cx"> public:
</span><span class="cx"> struct Configuration {
</span><span class="cx"> };
</span><span class="lines">@@ -45,9 +46,6 @@
</span><span class="cx"> static RefPtr<WebsiteDataStore> create(Configuration);
</span><span class="cx"> virtual ~WebsiteDataStore();
</span><span class="cx">
</span><del>- void addWebPage(WebPageProxy&);
- void removeWebPage(WebPageProxy&);
-
</del><span class="cx"> uint64_t identifier() const { return m_identifier; }
</span><span class="cx">
</span><span class="cx"> bool isNonPersistent() const { return m_sessionID.isEphemeral(); }
</span><span class="lines">@@ -59,7 +57,6 @@
</span><span class="cx"> explicit WebsiteDataStore(WebCore::SessionID);
</span><span class="cx"> explicit WebsiteDataStore(Configuration);
</span><span class="cx">
</span><del>- HashSet<WebPageProxy*> m_webPages;
</del><span class="cx"> uint64_t m_identifier;
</span><span class="cx"> WebCore::SessionID m_sessionID;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>