<!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>[177100] 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/177100">177100</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-10 14:31:52 -0800 (Wed, 10 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement the rest of the transient local storage namespace code
https://bugs.webkit.org/show_bug.cgi?id=139505
Reviewed by Tim Horton.
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::TransientLocalStorageNamespace::create):
(WebKit::StorageManager::TransientLocalStorageNamespace::~TransientLocalStorageNamespace):
(WebKit::StorageManager::TransientLocalStorageNamespace::getOrCreateStorageArea):
(WebKit::StorageManager::TransientLocalStorageNamespace::clearStorageAreasMatchingOrigin):
(WebKit::StorageManager::TransientLocalStorageNamespace::clearAllStorageAreas):
(WebKit::StorageManager::TransientLocalStorageNamespace::TransientLocalStorageNamespace):
Introduce a new TransientLocalStorageNamespace that's just a glorified SecurityOrigin -> StorageArea HashMap.
(WebKit::StorageManager::StorageArea::create):
Change the return type to RefPtr.
(WebKit::StorageManager::deleteEntriesForOrigin):
(WebKit::StorageManager::deleteAllEntries):
(WebKit::StorageManager::deleteLocalStorageOriginsModifiedSince):
Use lambdas instead of bind. Delete the transient local storage as well.
(WebKit::StorageManager::createTransientLocalStorageMap):
Get a transient local storage namespace and ask it for a storage area.
(WebKit::StorageManager::getOrCreateTransientLocalStorageNamespace):
Look up the namespace from the map and create one if it doesn't exist.
(WebKit::StorageManager::deleteEntriesForOriginInternal): Deleted.
(WebKit::StorageManager::deleteAllEntriesInternal): Deleted.
* UIProcess/Storage/StorageManager.h:</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177099 => 177100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-10 22:12:35 UTC (rev 177099)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-10 22:31:52 UTC (rev 177100)
</span><span class="lines">@@ -1,5 +1,40 @@
</span><span class="cx"> 2014-12-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Implement the rest of the transient local storage namespace code
+ https://bugs.webkit.org/show_bug.cgi?id=139505
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::TransientLocalStorageNamespace::create):
+ (WebKit::StorageManager::TransientLocalStorageNamespace::~TransientLocalStorageNamespace):
+ (WebKit::StorageManager::TransientLocalStorageNamespace::getOrCreateStorageArea):
+ (WebKit::StorageManager::TransientLocalStorageNamespace::clearStorageAreasMatchingOrigin):
+ (WebKit::StorageManager::TransientLocalStorageNamespace::clearAllStorageAreas):
+ (WebKit::StorageManager::TransientLocalStorageNamespace::TransientLocalStorageNamespace):
+ Introduce a new TransientLocalStorageNamespace that's just a glorified SecurityOrigin -> StorageArea HashMap.
+
+ (WebKit::StorageManager::StorageArea::create):
+ Change the return type to RefPtr.
+
+ (WebKit::StorageManager::deleteEntriesForOrigin):
+ (WebKit::StorageManager::deleteAllEntries):
+ (WebKit::StorageManager::deleteLocalStorageOriginsModifiedSince):
+ Use lambdas instead of bind. Delete the transient local storage as well.
+
+ (WebKit::StorageManager::createTransientLocalStorageMap):
+ Get a transient local storage namespace and ask it for a storage area.
+
+ (WebKit::StorageManager::getOrCreateTransientLocalStorageNamespace):
+ Look up the namespace from the map and create one if it doesn't exist.
+
+ (WebKit::StorageManager::deleteEntriesForOriginInternal): Deleted.
+ (WebKit::StorageManager::deleteAllEntriesInternal): Deleted.
+
+ * UIProcess/Storage/StorageManager.h:
+
+2014-12-10 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Begin fixing transient local storage handling
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139503
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (177099 => 177100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-12-10 22:12:35 UTC (rev 177099)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-12-10 22:31:52 UTC (rev 177100)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> class StorageManager::StorageArea : public ThreadSafeRefCounted<StorageManager::StorageArea> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<StorageArea> create(LocalStorageNamespace*, PassRefPtr<SecurityOrigin>, unsigned quotaInBytes);
</del><ins>+ static RefPtr<StorageArea> create(LocalStorageNamespace*, PassRefPtr<SecurityOrigin>, unsigned quotaInBytes);
</ins><span class="cx"> ~StorageArea();
</span><span class="cx">
</span><span class="cx"> SecurityOrigin* securityOrigin() const { return m_securityOrigin.get(); }
</span><span class="lines">@@ -106,7 +106,55 @@
</span><span class="cx"> HashMap<RefPtr<SecurityOrigin>, StorageArea*> m_storageAreaMap;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-PassRefPtr<StorageManager::StorageArea> StorageManager::StorageArea::create(LocalStorageNamespace* localStorageNamespace, PassRefPtr<SecurityOrigin> securityOrigin, unsigned quotaInBytes)
</del><ins>+class StorageManager::TransientLocalStorageNamespace : public ThreadSafeRefCounted<TransientLocalStorageNamespace> {
+public:
+ static RefPtr<TransientLocalStorageNamespace> create()
+ {
+ return adoptRef(new TransientLocalStorageNamespace());
+ }
+
+ ~TransientLocalStorageNamespace()
+ {
+ }
+
+ RefPtr<StorageArea> getOrCreateStorageArea(PassRefPtr<SecurityOrigin> securityOrigin)
+ {
+ auto& slot = m_storageAreaMap.add(securityOrigin.get(), nullptr).iterator->value;
+ if (slot)
+ return slot;
+
+ auto storageArea = StorageArea::create(nullptr, securityOrigin, m_quotaInBytes);
+ slot = storageArea.get();
+
+ return storageArea;
+ }
+
+ void clearStorageAreasMatchingOrigin(const SecurityOrigin& securityOrigin)
+ {
+ for (auto& storageArea : m_storageAreaMap.values()) {
+ if (storageArea->securityOrigin()->equal(&securityOrigin))
+ storageArea->clear();
+ }
+ }
+
+ void clearAllStorageAreas()
+ {
+ for (auto& storageArea : m_storageAreaMap.values())
+ storageArea->clear();
+ }
+
+private:
+ explicit TransientLocalStorageNamespace()
+ {
+ }
+
+ const unsigned m_quotaInBytes = 5 * 1024 * 1024;
+
+ // We don't hold an explicit reference to the StorageAreas; they are kept alive by the m_storageAreasByConnection map in StorageManager.
+ HashMap<RefPtr<SecurityOrigin>, StorageArea*> m_storageAreaMap;
+};
+
+RefPtr<StorageManager::StorageArea> StorageManager::StorageArea::create(LocalStorageNamespace* localStorageNamespace, PassRefPtr<SecurityOrigin> securityOrigin, unsigned quotaInBytes)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new StorageArea(localStorageNamespace, securityOrigin, quotaInBytes));
</span><span class="cx"> }
</span><span class="lines">@@ -446,12 +494,33 @@
</span><span class="cx">
</span><span class="cx"> void StorageManager::deleteEntriesForOrigin(const SecurityOrigin& securityOrigin)
</span><span class="cx"> {
</span><del>- m_queue->dispatch(bind(&StorageManager::deleteEntriesForOriginInternal, this, RefPtr<SecurityOrigin>(const_cast<SecurityOrigin*>(&securityOrigin))));
</del><ins>+ RefPtr<StorageManager> storageManager(this);
+
+ RefPtr<SecurityOrigin> copiedOrigin = securityOrigin.isolatedCopy();
+ m_queue->dispatch([storageManager, copiedOrigin] {
+ for (auto& localStorageNamespace : storageManager->m_localStorageNamespaces.values())
+ localStorageNamespace->clearStorageAreasMatchingOrigin(copiedOrigin.get());
+
+ for (auto& transientLocalStorageNamespace : storageManager->m_transientLocalStorageNamespaces.values())
+ transientLocalStorageNamespace->clearStorageAreasMatchingOrigin(*copiedOrigin);
+
+ storageManager->m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(copiedOrigin.get());
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageManager::deleteAllEntries()
</span><span class="cx"> {
</span><del>- m_queue->dispatch(bind(&StorageManager::deleteAllEntriesInternal, this));
</del><ins>+ RefPtr<StorageManager> storageManager(this);
+
+ m_queue->dispatch([storageManager] {
+ for (auto& localStorageNamespace : storageManager->m_localStorageNamespaces.values())
+ localStorageNamespace->clearAllStorageAreas();
+
+ for (auto& transientLocalStorageNamespace : storageManager->m_transientLocalStorageNamespaces.values())
+ transientLocalStorageNamespace->clearAllStorageAreas();
+
+ storageManager->m_localStorageDatabaseTracker->deleteAllDatabases();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageManager::deleteLocalStorageOriginsModifiedSince(time_t time, std::function<void ()> completionHandler)
</span><span class="lines">@@ -466,6 +535,9 @@
</span><span class="cx"> localStorageNamespace->clearStorageAreasMatchingOrigin(origin.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ for (auto& transientLocalStorageNamespace : storageManager->m_transientLocalStorageNamespaces.values())
+ transientLocalStorageNamespace->clearAllStorageAreas();
+
</ins><span class="cx"> RunLoop::main().dispatch(completionHandler);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -496,7 +568,20 @@
</span><span class="cx">
</span><span class="cx"> void StorageManager::createTransientLocalStorageMap(IPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& topLevelOriginData, const SecurityOriginData& securityOriginData)
</span><span class="cx"> {
</span><del>- // FIXME: Implement this.
</del><ins>+ // FIXME: This should be a message check.
+ ASSERT(m_storageAreasByConnection.isValidKey({ connection, storageMapID }));
+
+ auto& slot = m_storageAreasByConnection.add({ connection, storageMapID }, nullptr).iterator->value;
+
+ // FIXME: This should be a message check.
+ ASSERT(!slot);
+
+ TransientLocalStorageNamespace* transientLocalStorageNamespace = getOrCreateTransientLocalStorageNamespace(storageNamespaceID, *topLevelOriginData.securityOrigin());
+
+ auto storageArea = transientLocalStorageNamespace->getOrCreateStorageArea(securityOriginData.securityOrigin());
+ storageArea->addListener(connection, storageMapID);
+
+ slot = WTF::move(storageArea);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageManager::createSessionStorageMap(IPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
</span><span class="lines">@@ -686,21 +771,16 @@
</span><span class="cx"> return result.iterator->value.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::deleteEntriesForOriginInternal(SecurityOrigin* securityOrigin)
</del><ins>+StorageManager::TransientLocalStorageNamespace* StorageManager::getOrCreateTransientLocalStorageNamespace(uint64_t storageNamespaceID, WebCore::SecurityOrigin& topLevelOrigin)
</ins><span class="cx"> {
</span><del>- for (auto it = m_localStorageNamespaces.begin(), end = m_localStorageNamespaces.end(); it != end; ++it)
- it->value->clearStorageAreasMatchingOrigin(securityOrigin);
</del><ins>+ if (!m_transientLocalStorageNamespaces.isValidKey({ storageNamespaceID, &topLevelOrigin }))
+ return nullptr;
</ins><span class="cx">
</span><del>- m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(securityOrigin);
-}
</del><ins>+ auto& slot = m_transientLocalStorageNamespaces.add({ storageNamespaceID, &topLevelOrigin }, nullptr).iterator->value;
+ if (!slot)
+ slot = TransientLocalStorageNamespace::create();
</ins><span class="cx">
</span><del>-void StorageManager::deleteAllEntriesInternal()
-{
- for (auto it = m_localStorageNamespaces.begin(), end = m_localStorageNamespaces.end(); it != end; ++it)
- it->value->clearAllStorageAreas();
-
- m_localStorageDatabaseTracker->deleteAllDatabases();
</del><ins>+ return slot.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (177099 => 177100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2014-12-10 22:12:35 UTC (rev 177099)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2014-12-10 22:31:52 UTC (rev 177100)
</span><span class="lines">@@ -98,14 +98,16 @@
</span><span class="cx"> class LocalStorageNamespace;
</span><span class="cx"> LocalStorageNamespace* getOrCreateLocalStorageNamespace(uint64_t storageNamespaceID);
</span><span class="cx">
</span><del>- void deleteEntriesForOriginInternal(WebCore::SecurityOrigin*);
- void deleteAllEntriesInternal();
</del><ins>+ class TransientLocalStorageNamespace;
+ TransientLocalStorageNamespace* getOrCreateTransientLocalStorageNamespace(uint64_t storageNamespaceID, WebCore::SecurityOrigin& topLevelOrigin);
</ins><span class="cx">
</span><span class="cx"> RefPtr<WorkQueue> m_queue;
</span><span class="cx">
</span><span class="cx"> RefPtr<LocalStorageDatabaseTracker> m_localStorageDatabaseTracker;
</span><span class="cx"> HashMap<uint64_t, RefPtr<LocalStorageNamespace>> m_localStorageNamespaces;
</span><span class="cx">
</span><ins>+ HashMap<std::pair<uint64_t, RefPtr<WebCore::SecurityOrigin>>, RefPtr<TransientLocalStorageNamespace>> m_transientLocalStorageNamespaces;
+
</ins><span class="cx"> class SessionStorageNamespace;
</span><span class="cx"> HashMap<uint64_t, RefPtr<SessionStorageNamespace>> m_sessionStorageNamespaces;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>