<!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>[184516] 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/184516">184516</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-05-18 15:39:00 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKWebsiteDataStore should fully support session storage
https://bugs.webkit.org/show_bug.cgi?id=145145
rdar://problem/10690447
Reviewed by Sam Weinig.
Add a session store data type and handle it when clearing and fetching data.
* Shared/WebsiteData/WebsiteDataTypes.h:
* UIProcess/API/Cocoa/WKWebsiteDataRecord.h:
* UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:
(dataTypesToString):
* UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
(WebKit::toWebsiteDataTypes):
(WebKit::toWKWebsiteDataTypes):
* UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
(+[WKWebsiteDataStore allWebsiteDataTypes]):
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::SessionStorageNamespace::origins):
(WebKit::StorageManager::SessionStorageNamespace::clearStorageAreasMatchingOrigin):
(WebKit::StorageManager::SessionStorageNamespace::clearAllStorageAreas):
(WebKit::StorageManager::getSessionStorageOrigins):
(WebKit::StorageManager::deleteSessionStorageOrigins):
(WebKit::StorageManager::deleteSessionStorageEntriesForOrigins):
* UIProcess/Storage/StorageManager.h:
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::fetchData):
(WebKit::WebsiteDataStore::removeData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypesh">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoremm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm</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 (184515 => 184516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-18 22:16:59 UTC (rev 184515)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-18 22:39:00 UTC (rev 184516)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-05-18 Anders Carlsson <andersca@apple.com>
+
+ WKWebsiteDataStore should fully support session storage
+ https://bugs.webkit.org/show_bug.cgi?id=145145
+ rdar://problem/10690447
+
+ Reviewed by Sam Weinig.
+
+ Add a session store data type and handle it when clearing and fetching data.
+
+ * Shared/WebsiteData/WebsiteDataTypes.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataRecord.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:
+ (dataTypesToString):
+ * UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
+ (WebKit::toWebsiteDataTypes):
+ (WebKit::toWKWebsiteDataTypes):
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (+[WKWebsiteDataStore allWebsiteDataTypes]):
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::SessionStorageNamespace::origins):
+ (WebKit::StorageManager::SessionStorageNamespace::clearStorageAreasMatchingOrigin):
+ (WebKit::StorageManager::SessionStorageNamespace::clearAllStorageAreas):
+ (WebKit::StorageManager::getSessionStorageOrigins):
+ (WebKit::StorageManager::deleteSessionStorageOrigins):
+ (WebKit::StorageManager::deleteSessionStorageEntriesForOrigins):
+ * UIProcess/Storage/StorageManager.h:
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::fetchData):
+ (WebKit::WebsiteDataStore::removeData):
+
</ins><span class="cx"> 2015-05-18 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Followup to: Networking process on iOS can be suspended and never exit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h (184515 => 184516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-05-18 22:16:59 UTC (rev 184515)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-05-18 22:39:00 UTC (rev 184516)
</span><span class="lines">@@ -33,9 +33,10 @@
</span><span class="cx"> WebsiteDataTypeDiskCache = 1 << 1,
</span><span class="cx"> WebsiteDataTypeMemoryCache = 1 << 2,
</span><span class="cx"> WebsiteDataTypeOfflineWebApplicationCache = 1 << 3,
</span><del>- WebsiteDataTypeLocalStorage = 1 << 4,
- WebsiteDataTypeWebSQLDatabases = 1 << 5,
- WebsiteDataTypeIndexedDBDatabases = 1 << 6,
</del><ins>+ WebsiteDataTypeSessionStorage = 1 << 4,
+ WebsiteDataTypeLocalStorage = 1 << 5,
+ WebsiteDataTypeWebSQLDatabases = 1 << 6,
+ WebsiteDataTypeIndexedDBDatabases = 1 << 7,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h (184515 => 184516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h 2015-05-18 22:16:59 UTC (rev 184515)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h 2015-05-18 22:39:00 UTC (rev 184516)
</span><span class="lines">@@ -43,6 +43,9 @@
</span><span class="cx"> /*! @constant WKWebsiteDataTypeCookies Cookies. */
</span><span class="cx"> WK_EXTERN NSString * const WKWebsiteDataTypeCookies WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span><ins>+/*! @constant WKWebsiteDataTypeSessionStorage HTML session storage. */
+WK_EXTERN NSString * const WKWebsiteDataTypeSessionStorage WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
</ins><span class="cx"> /*! @constant WKWebsiteDataTypeLocalStorage HTML local storage. */
</span><span class="cx"> WK_EXTERN NSString * const WKWebsiteDataTypeLocalStorage WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm (184515 => 184516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2015-05-18 22:16:59 UTC (rev 184515)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2015-05-18 22:39:00 UTC (rev 184516)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx"> NSString * const WKWebsiteDataTypeOfflineWebApplicationCache = @"WKWebsiteDataTypeOfflineWebApplicationCache";
</span><span class="cx">
</span><span class="cx"> NSString * const WKWebsiteDataTypeCookies = @"WKWebsiteDataTypeCookies";
</span><ins>+NSString * const WKWebsiteDataTypeSessionStorage = @"WKWebsiteDataTypeSessionStorage";
+
</ins><span class="cx"> NSString * const WKWebsiteDataTypeLocalStorage = @"WKWebsiteDataTypeLocalStorage";
</span><span class="cx"> NSString * const WKWebsiteDataTypeWebSQLDatabases = @"WKWebsiteDataTypeWebSQLDatabases";
</span><span class="cx"> NSString * const WKWebsiteDataTypeIndexedDBDatabases = @"WKWebsiteDataTypeIndexedDBDatabases";
</span><span class="lines">@@ -58,6 +60,8 @@
</span><span class="cx"> [array addObject:@"Offline Web Application Cache"];
</span><span class="cx"> if ([dataTypes containsObject:WKWebsiteDataTypeCookies])
</span><span class="cx"> [array addObject:@"Cookies"];
</span><ins>+ if ([dataTypes containsObject:WKWebsiteDataTypeSessionStorage])
+ [array addObject:@"Session Storage"];
</ins><span class="cx"> if ([dataTypes containsObject:WKWebsiteDataTypeLocalStorage])
</span><span class="cx"> [array addObject:@"Local Storage"];
</span><span class="cx"> if ([dataTypes containsObject:WKWebsiteDataTypeWebSQLDatabases])
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h (184515 => 184516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2015-05-18 22:16:59 UTC (rev 184515)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2015-05-18 22:39:00 UTC (rev 184516)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeMemoryCache;
</span><span class="cx"> if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeOfflineWebApplicationCache])
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeOfflineWebApplicationCache;
</span><ins>+ if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeSessionStorage])
+ websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeSessionStorage;
</ins><span class="cx"> if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeLocalStorage])
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeLocalStorage;
</span><span class="cx"> if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeWebSQLDatabases])
</span><span class="lines">@@ -76,6 +78,8 @@
</span><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeMemoryCache];
</span><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeOfflineWebApplicationCache)
</span><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeOfflineWebApplicationCache];
</span><ins>+ if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeSessionStorage)
+ [wkWebsiteDataTypes addObject:WKWebsiteDataTypeSessionStorage];
</ins><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeLocalStorage)
</span><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeLocalStorage];
</span><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeWebSQLDatabases)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (184515 => 184516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2015-05-18 22:16:59 UTC (rev 184515)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2015-05-18 22:39:00 UTC (rev 184516)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> static dispatch_once_t onceToken;
</span><span class="cx"> static NSSet *allWebsiteDataTypes;
</span><span class="cx"> dispatch_once(&onceToken, ^{
</span><del>- allWebsiteDataTypes = [[NSSet alloc] initWithArray:@[ WKWebsiteDataTypeDiskCache, WKWebsiteDataTypeMemoryCache, WKWebsiteDataTypeOfflineWebApplicationCache, WKWebsiteDataTypeCookies, WKWebsiteDataTypeLocalStorage, WKWebsiteDataTypeWebSQLDatabases ]];
</del><ins>+ allWebsiteDataTypes = [[NSSet alloc] initWithArray:@[ WKWebsiteDataTypeDiskCache, WKWebsiteDataTypeMemoryCache, WKWebsiteDataTypeOfflineWebApplicationCache, WKWebsiteDataTypeCookies, WKWebsiteDataTypeSessionStorage, WKWebsiteDataTypeLocalStorage, WKWebsiteDataTypeWebSQLDatabases ]];
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return allWebsiteDataTypes;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (184515 => 184516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-05-18 22:16:59 UTC (rev 184515)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-05-18 22:39:00 UTC (rev 184516)
</span><span class="lines">@@ -380,6 +380,32 @@
</span><span class="cx">
</span><span class="cx"> void cloneTo(SessionStorageNamespace& newSessionStorageNamespace);
</span><span class="cx">
</span><ins>+ Vector<RefPtr<SecurityOrigin>> origins() const
+ {
+ Vector<RefPtr<SecurityOrigin>> origins;
+
+ for (const auto& storageArea : m_storageAreaMap.values()) {
+ if (!storageArea->items().isEmpty())
+ origins.append(storageArea->securityOrigin());
+ }
+
+ return origins;
+ }
+
+ 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();
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit SessionStorageNamespace(unsigned quotaInBytes);
</span><span class="cx">
</span><span class="lines">@@ -526,6 +552,55 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void StorageManager::getSessionStorageOrigins(std::function<void (HashSet<RefPtr<WebCore::SecurityOrigin>>&&)> completionHandler)
+{
+ RefPtr<StorageManager> storageManager(this);
+
+ m_queue->dispatch([storageManager, completionHandler] {
+ HashSet<RefPtr<SecurityOrigin>> origins;
+
+ for (const auto& sessionStorageNamespace : storageManager->m_sessionStorageNamespaces.values()) {
+ for (auto& origin : sessionStorageNamespace->origins())
+ origins.add(WTF::move(origin));
+ }
+
+ RunLoop::main().dispatch([origins, completionHandler]() mutable {
+ completionHandler(WTF::move(origins));
+ });
+ });
+}
+
+void StorageManager::deleteSessionStorageOrigins(std::function<void ()> completionHandler)
+{
+ RefPtr<StorageManager> storageManager(this);
+
+ m_queue->dispatch([storageManager, completionHandler] {
+ for (auto& sessionStorageNamespace : storageManager->m_sessionStorageNamespaces.values())
+ sessionStorageNamespace->clearAllStorageAreas();
+
+ RunLoop::main().dispatch(completionHandler);
+ });
+}
+
+void StorageManager::deleteSessionStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
+{
+ Vector<RefPtr<WebCore::SecurityOrigin>> copiedOrigins;
+ copiedOrigins.reserveInitialCapacity(origins.size());
+
+ for (auto& origin : origins)
+ copiedOrigins.uncheckedAppend(origin->isolatedCopy());
+
+ RefPtr<StorageManager> storageManager(this);
+ m_queue->dispatch([storageManager, copiedOrigins, completionHandler] {
+ for (auto& origin : copiedOrigins) {
+ for (auto& sessionStorageNamespace : storageManager->m_sessionStorageNamespaces.values())
+ sessionStorageNamespace->clearStorageAreasMatchingOrigin(*origin);
+ }
+
+ RunLoop::main().dispatch(completionHandler);
+ });
+}
+
</ins><span class="cx"> void StorageManager::getLocalStorageOrigins(std::function<void (HashSet<RefPtr<WebCore::SecurityOrigin>>&&)> completionHandler)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (184515 => 184516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-05-18 22:16:59 UTC (rev 184515)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-05-18 22:39:00 UTC (rev 184516)
</span><span class="lines">@@ -59,6 +59,10 @@
</span><span class="cx"> void processDidCloseConnection(WebProcessProxy&, IPC::Connection&);
</span><span class="cx"> void applicationWillTerminate();
</span><span class="cx">
</span><ins>+ void getSessionStorageOrigins(std::function<void (HashSet<RefPtr<WebCore::SecurityOrigin>>&&)> completionHandler);
+ void deleteSessionStorageOrigins(std::function<void ()> completionHandler);
+ void deleteSessionStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&, std::function<void ()> completionHandler);
+
</ins><span class="cx"> void getLocalStorageOrigins(std::function<void (HashSet<RefPtr<WebCore::SecurityOrigin>>&&)> completionHandler);
</span><span class="cx"> void getLocalStorageDetailsByOrigin(std::function<void (Vector<LocalStorageDetails>)> completionHandler);
</span><span class="cx"> void deleteLocalStorageEntriesForOrigin(const WebCore::SecurityOrigin&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (184515 => 184516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-05-18 22:16:59 UTC (rev 184515)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-05-18 22:39:00 UTC (rev 184516)
</span><span class="lines">@@ -266,6 +266,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (dataTypes & WebsiteDataTypeSessionStorage && m_storageManager) {
+ callbackAggregator->addPendingCallback();
+
+ m_storageManager->getSessionStorageOrigins([callbackAggregator](HashSet<RefPtr<WebCore::SecurityOrigin>>&& origins) {
+ WebsiteData websiteData;
+
+ while (!origins.isEmpty())
+ websiteData.entries.append(WebsiteData::Entry { origins.takeAny(), WebsiteDataTypeSessionStorage });
+
+ callbackAggregator->removePendingCallback(WTF::move(websiteData));
+ });
+ }
+
</ins><span class="cx"> if (dataTypes & WebsiteDataTypeLocalStorage && m_storageManager) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><span class="lines">@@ -455,6 +468,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (dataTypes & WebsiteDataTypeSessionStorage && m_storageManager) {
+ callbackAggregator->addPendingCallback();
+
+ m_storageManager->deleteSessionStorageOrigins([callbackAggregator] {
+ callbackAggregator->removePendingCallback();
+ });
+ }
+
</ins><span class="cx"> if (dataTypes & WebsiteDataTypeLocalStorage && m_storageManager) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><span class="lines">@@ -614,6 +635,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (dataTypes & WebsiteDataTypeSessionStorage && m_storageManager) {
+ callbackAggregator->addPendingCallback();
+
+ m_storageManager->deleteSessionStorageEntriesForOrigins(origins, [callbackAggregator] {
+ callbackAggregator->removePendingCallback();
+ });
+ }
+
</ins><span class="cx"> if (dataTypes & WebsiteDataTypeLocalStorage && m_storageManager) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>