<!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>[214973] 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/214973">214973</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2017-04-05 15:38:24 -0700 (Wed, 05 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor so WebsiteDataStores always have a StorageManager.
https://bugs.webkit.org/show_bug.cgi?id=170521
Reviewed by Geoff Garen.
This basically involves teaching StorageManager how to work without a LocalStorageDatabaseTracker,
since there will never be ephemeral bits on disk to track.
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::StorageArea::openDatabaseAndImportItemsIfNeeded):
(WebKit::StorageManager::createEphemeral):
(WebKit::StorageManager::StorageManager):
(WebKit::StorageManager::getLocalStorageOrigins):
(WebKit::StorageManager::getLocalStorageOriginDetails):
(WebKit::StorageManager::deleteLocalStorageEntriesForOrigin):
(WebKit::StorageManager::deleteLocalStorageOriginsModifiedSince):
(WebKit::StorageManager::deleteLocalStorageEntriesForOrigins):
* UIProcess/Storage/StorageManager.h:
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::WebsiteDataStore):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagerh">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (214972 => 214973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-04-05 22:17:50 UTC (rev 214972)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-05 22:38:24 UTC (rev 214973)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-04-05 Brady Eidson <beidson@apple.com>
+
+ Refactor so WebsiteDataStores always have a StorageManager.
+ https://bugs.webkit.org/show_bug.cgi?id=170521
+
+ Reviewed by Geoff Garen.
+
+ This basically involves teaching StorageManager how to work without a LocalStorageDatabaseTracker,
+ since there will never be ephemeral bits on disk to track.
+
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::StorageArea::openDatabaseAndImportItemsIfNeeded):
+ (WebKit::StorageManager::createEphemeral):
+ (WebKit::StorageManager::StorageManager):
+ (WebKit::StorageManager::getLocalStorageOrigins):
+ (WebKit::StorageManager::getLocalStorageOriginDetails):
+ (WebKit::StorageManager::deleteLocalStorageEntriesForOrigin):
+ (WebKit::StorageManager::deleteLocalStorageOriginsModifiedSince):
+ (WebKit::StorageManager::deleteLocalStorageEntriesForOrigins):
+ * UIProcess/Storage/StorageManager.h:
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::WebsiteDataStore):
+
</ins><span class="cx"> 2017-04-05 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][iOS] Add entitlements to enable audio/video capture in WebProcess
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (214972 => 214973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2017-04-05 22:17:50 UTC (rev 214972)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2017-04-05 22:38:24 UTC (rev 214973)
</span><span class="lines">@@ -281,12 +281,12 @@
</span><span class="cx">
</span><span class="cx"> void StorageManager::StorageArea::openDatabaseAndImportItemsIfNeeded() const
</span><span class="cx"> {
</span><del>- if (!m_localStorageNamespace)
</del><ins>+ if (!m_localStorageNamespace || !m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // We open the database here even if we've already imported our items to ensure that the database is open if we need to write to it.
</span><span class="cx"> if (!m_localStorageDatabase)
</span><del>- m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->storageManager()->m_queue.copyRef(), m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker.copyRef(), m_securityOrigin);
</del><ins>+ m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->storageManager()->m_queue.copyRef(), *m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker, m_securityOrigin);
</ins><span class="cx">
</span><span class="cx"> if (m_didImportItemsFromDatabase)
</span><span class="cx"> return;
</span><span class="lines">@@ -451,10 +451,17 @@
</span><span class="cx"> return adoptRef(*new StorageManager(localStorageDirectory));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Ref<StorageManager> StorageManager::createEphemeral()
+{
+ return adoptRef(*new StorageManager({ }));
+}
+
</ins><span class="cx"> StorageManager::StorageManager(const String& localStorageDirectory)
</span><span class="cx"> : m_queue(WorkQueue::create("com.apple.WebKit.StorageManager"))
</span><del>- , m_localStorageDatabaseTracker(LocalStorageDatabaseTracker::create(m_queue.copyRef(), localStorageDirectory))
</del><span class="cx"> {
</span><ins>+ if (!localStorageDirectory.isEmpty())
+ m_localStorageDatabaseTracker = LocalStorageDatabaseTracker::create(m_queue.copyRef(), localStorageDirectory);
+
</ins><span class="cx"> // Make sure the encoding is initialized before we start dispatching things to the queue.
</span><span class="cx"> UTF8Encoding();
</span><span class="cx"> }
</span><span class="lines">@@ -580,8 +587,10 @@
</span><span class="cx"> m_queue->dispatch([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)]() mutable {
</span><span class="cx"> HashSet<SecurityOriginData> origins;
</span><span class="cx">
</span><del>- for (auto& origin : m_localStorageDatabaseTracker->origins())
- origins.add(origin);
</del><ins>+ if (m_localStorageDatabaseTracker) {
+ for (auto& origin : m_localStorageDatabaseTracker->origins())
+ origins.add(origin);
+ }
</ins><span class="cx">
</span><span class="cx"> for (auto& transientLocalStorageNamespace : m_transientLocalStorageNamespaces.values()) {
</span><span class="cx"> for (auto& origin : transientLocalStorageNamespace->origins())
</span><span class="lines">@@ -597,7 +606,9 @@
</span><span class="cx"> void StorageManager::getLocalStorageOriginDetails(std::function<void (Vector<LocalStorageDatabaseTracker::OriginDetails>)>&& completionHandler)
</span><span class="cx"> {
</span><span class="cx"> m_queue->dispatch([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)]() mutable {
</span><del>- auto originDetails = m_localStorageDatabaseTracker->originDetails();
</del><ins>+ Vector<LocalStorageDatabaseTracker::OriginDetails> originDetails;
+ if (m_localStorageDatabaseTracker)
+ originDetails = m_localStorageDatabaseTracker->originDetails();
</ins><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([originDetails = WTFMove(originDetails), completionHandler = WTFMove(completionHandler)]() mutable {
</span><span class="cx"> completionHandler(WTFMove(originDetails));
</span><span class="lines">@@ -614,7 +625,8 @@
</span><span class="cx"> for (auto& transientLocalStorageNamespace : m_transientLocalStorageNamespaces.values())
</span><span class="cx"> transientLocalStorageNamespace->clearStorageAreasMatchingOrigin(copiedOrigin);
</span><span class="cx">
</span><del>- m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(copiedOrigin);
</del><ins>+ if (m_localStorageDatabaseTracker)
+ m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(copiedOrigin);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -621,7 +633,9 @@
</span><span class="cx"> void StorageManager::deleteLocalStorageOriginsModifiedSince(std::chrono::system_clock::time_point time, std::function<void()>&& completionHandler)
</span><span class="cx"> {
</span><span class="cx"> m_queue->dispatch([this, protectedThis = makeRef(*this), time, completionHandler = WTFMove(completionHandler)]() mutable {
</span><del>- auto deletedOrigins = m_localStorageDatabaseTracker->deleteDatabasesModifiedSince(time);
</del><ins>+ Vector<WebCore::SecurityOriginData> deletedOrigins;
+ if (m_localStorageDatabaseTracker)
+ deletedOrigins = m_localStorageDatabaseTracker->deleteDatabasesModifiedSince(time);
</ins><span class="cx">
</span><span class="cx"> for (const auto& origin : deletedOrigins) {
</span><span class="cx"> for (auto& localStorageNamespace : m_localStorageNamespaces.values())
</span><span class="lines">@@ -651,7 +665,8 @@
</span><span class="cx"> for (auto& transientLocalStorageNamespace : m_transientLocalStorageNamespaces.values())
</span><span class="cx"> transientLocalStorageNamespace->clearStorageAreasMatchingOrigin(origin);
</span><span class="cx">
</span><del>- m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(origin);
</del><ins>+ if (m_localStorageDatabaseTracker)
+ m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(origin);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch(WTFMove(completionHandler));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (214972 => 214973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2017-04-05 22:17:50 UTC (rev 214972)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2017-04-05 22:38:24 UTC (rev 214973)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> class StorageManager : public IPC::Connection::WorkQueueMessageReceiver {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<StorageManager> create(const String& localStorageDirectory);
</span><ins>+ static Ref<StorageManager> createEphemeral();
</ins><span class="cx"> ~StorageManager();
</span><span class="cx">
</span><span class="cx"> void createSessionStorageNamespace(uint64_t storageNamespaceID, unsigned quotaInBytes);
</span><span class="lines">@@ -99,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<WorkQueue> m_queue;
</span><span class="cx">
</span><del>- Ref<LocalStorageDatabaseTracker> m_localStorageDatabaseTracker;
</del><ins>+ RefPtr<LocalStorageDatabaseTracker> m_localStorageDatabaseTracker;
</ins><span class="cx"> HashMap<uint64_t, RefPtr<LocalStorageNamespace>> m_localStorageNamespaces;
</span><span class="cx">
</span><span class="cx"> HashMap<std::pair<uint64_t, WebCore::SecurityOriginData>, RefPtr<TransientLocalStorageNamespace>> m_transientLocalStorageNamespaces;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (214972 => 214973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-04-05 22:17:50 UTC (rev 214972)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-04-05 22:38:24 UTC (rev 214973)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> : m_identifier(generateIdentifier())
</span><span class="cx"> , m_sessionID(sessionID)
</span><span class="cx"> , m_configuration()
</span><ins>+ , m_storageManager(StorageManager::createEphemeral())
</ins><span class="cx"> , m_queue(WorkQueue::create("com.apple.WebKit.WebsiteDataStore"))
</span><span class="cx"> {
</span><span class="cx"> platformInitialize();
</span></span></pre>
</div>
</div>
</body>
</html>