<!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>[184295] 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/184295">184295</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-05-13 12:24:10 -0700 (Wed, 13 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename some StorageManager functions to indicate that they work on local storage entries
https://bugs.webkit.org/show_bug.cgi?id=144958
First part of rdar://problem/10690447.
Reviewed by Beth Dakin.
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::getLocalStorageOrigins):
(WebKit::StorageManager::getLocalStorageDetailsByOrigin):
(WebKit::StorageManager::deleteLocalStorageEntriesForOrigin):
(WebKit::StorageManager::deleteAllLocalStorageEntries):
(WebKit::StorageManager::deleteLocalStorageEntriesForOrigins):
(WebKit::StorageManager::getOrigins): Deleted.
(WebKit::StorageManager::getStorageDetailsByOrigin): Deleted.
(WebKit::StorageManager::deleteEntriesForOrigin): Deleted.
(WebKit::StorageManager::deleteAllEntries): Deleted.
(WebKit::StorageManager::deleteEntriesForOrigins): Deleted.
* UIProcess/Storage/StorageManager.h:
* UIProcess/WebKeyValueStorageManager.cpp:
(WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
(WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
(WebKit::WebKeyValueStorageManager::deleteEntriesForOrigin):
(WebKit::WebKeyValueStorageManager::deleteAllEntries):
* 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="#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="#trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp">trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp</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 (184294 => 184295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-13 19:20:42 UTC (rev 184294)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-13 19:24:10 UTC (rev 184295)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-05-13 Anders Carlsson <andersca@apple.com>
+
+ Rename some StorageManager functions to indicate that they work on local storage entries
+ https://bugs.webkit.org/show_bug.cgi?id=144958
+ First part of rdar://problem/10690447.
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::getLocalStorageOrigins):
+ (WebKit::StorageManager::getLocalStorageDetailsByOrigin):
+ (WebKit::StorageManager::deleteLocalStorageEntriesForOrigin):
+ (WebKit::StorageManager::deleteAllLocalStorageEntries):
+ (WebKit::StorageManager::deleteLocalStorageEntriesForOrigins):
+ (WebKit::StorageManager::getOrigins): Deleted.
+ (WebKit::StorageManager::getStorageDetailsByOrigin): Deleted.
+ (WebKit::StorageManager::deleteEntriesForOrigin): Deleted.
+ (WebKit::StorageManager::deleteAllEntries): Deleted.
+ (WebKit::StorageManager::deleteEntriesForOrigins): Deleted.
+ * UIProcess/Storage/StorageManager.h:
+ * UIProcess/WebKeyValueStorageManager.cpp:
+ (WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
+ (WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
+ (WebKit::WebKeyValueStorageManager::deleteEntriesForOrigin):
+ (WebKit::WebKeyValueStorageManager::deleteAllEntries):
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::fetchData):
+ (WebKit::WebsiteDataStore::removeData):
+
</ins><span class="cx"> 2015-05-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash under WebKit::WebInspectorProxy::attachAvailabilityChanged sometimes opening new page
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (184294 => 184295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-05-13 19:20:42 UTC (rev 184294)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-05-13 19:24:10 UTC (rev 184295)
</span><span class="lines">@@ -514,7 +514,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::getOrigins(std::function<void (Vector<RefPtr<WebCore::SecurityOrigin>>)> completionHandler)
</del><ins>+void StorageManager::getLocalStorageOrigins(std::function<void (Vector<RefPtr<WebCore::SecurityOrigin>>)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><span class="cx">
</span><span class="lines">@@ -527,7 +527,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::getStorageDetailsByOrigin(std::function<void (Vector<LocalStorageDetails>)> completionHandler)
</del><ins>+void StorageManager::getLocalStorageDetailsByOrigin(std::function<void (Vector<LocalStorageDetails>)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><span class="cx">
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::deleteEntriesForOrigin(const SecurityOrigin& securityOrigin)
</del><ins>+void StorageManager::deleteLocalStorageEntriesForOrigin(const SecurityOrigin& securityOrigin)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><span class="cx">
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::deleteAllEntries()
</del><ins>+void StorageManager::deleteAllLocalStorageEntries()
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><span class="cx">
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::deleteEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
</del><ins>+void StorageManager::deleteLocalStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> copiedOrigins;
</span><span class="cx"> copiedOrigins.reserveInitialCapacity(origins.size());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (184294 => 184295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-05-13 19:20:42 UTC (rev 184294)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-05-13 19:24:10 UTC (rev 184295)
</span><span class="lines">@@ -57,13 +57,13 @@
</span><span class="cx"> void processDidCloseConnection(WebProcessProxy&, IPC::Connection&);
</span><span class="cx"> void applicationWillTerminate();
</span><span class="cx">
</span><del>- void getOrigins(std::function<void (Vector<RefPtr<WebCore::SecurityOrigin>>)> completionHandler);
- void getStorageDetailsByOrigin(std::function<void (Vector<LocalStorageDetails>)> completionHandler);
- void deleteEntriesForOrigin(const WebCore::SecurityOrigin&);
- void deleteAllEntries();
</del><ins>+ void getLocalStorageOrigins(std::function<void (Vector<RefPtr<WebCore::SecurityOrigin>>)> completionHandler);
+ void getLocalStorageDetailsByOrigin(std::function<void (Vector<LocalStorageDetails>)> completionHandler);
+ void deleteLocalStorageEntriesForOrigin(const WebCore::SecurityOrigin&);
+ void deleteAllLocalStorageEntries();
</ins><span class="cx">
</span><span class="cx"> void deleteLocalStorageOriginsModifiedSince(std::chrono::system_clock::time_point, std::function<void ()> completionHandler);
</span><del>- void deleteEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&, std::function<void ()> completionHandler);
</del><ins>+ void deleteLocalStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&, std::function<void ()> completionHandler);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit StorageManager(const String& localStorageDirectory);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp (184294 => 184295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2015-05-13 19:20:42 UTC (rev 184294)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2015-05-13 19:24:10 UTC (rev 184295)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- storageManager->getOrigins([callbackFunction](Vector<RefPtr<SecurityOrigin>> securityOrigins) {
</del><ins>+ storageManager->getLocalStorageOrigins([callbackFunction](Vector<RefPtr<SecurityOrigin>> securityOrigins) {
</ins><span class="cx"> Vector<RefPtr<API::Object>> webSecurityOrigins;
</span><span class="cx"> webSecurityOrigins.reserveInitialCapacity(securityOrigins.size());
</span><span class="cx"> for (auto& origin : securityOrigins)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- storageManager->getStorageDetailsByOrigin([callbackFunction](Vector<LocalStorageDetails> storageDetails) {
</del><ins>+ storageManager->getLocalStorageDetailsByOrigin([callbackFunction](Vector<LocalStorageDetails> storageDetails) {
</ins><span class="cx"> HashMap<String, RefPtr<API::Object>> detailsMap;
</span><span class="cx"> Vector<RefPtr<API::Object>> result;
</span><span class="cx"> result.reserveInitialCapacity(storageDetails.size());
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> if (!storageManager)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- storageManager->deleteEntriesForOrigin(origin->securityOrigin());
</del><ins>+ storageManager->deleteLocalStorageEntriesForOrigin(origin->securityOrigin());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebKeyValueStorageManager::deleteAllEntries()
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> if (!storageManager)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- storageManager->deleteAllEntries();
</del><ins>+ storageManager->deleteAllLocalStorageEntries();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (184294 => 184295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-05-13 19:20:42 UTC (rev 184294)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-05-13 19:24:10 UTC (rev 184295)
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> if (dataTypes & WebsiteDataTypeLocalStorage && m_storageManager) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_storageManager->getOrigins([callbackAggregator](Vector<RefPtr<WebCore::SecurityOrigin>> origins) {
</del><ins>+ m_storageManager->getLocalStorageOrigins([callbackAggregator](Vector<RefPtr<WebCore::SecurityOrigin>> origins) {
</ins><span class="cx"> WebsiteData websiteData;
</span><span class="cx"> for (auto& origin : origins)
</span><span class="cx"> websiteData.entries.append(WebsiteData::Entry { WTF::move(origin), WebsiteDataTypeLocalStorage });
</span><span class="lines">@@ -616,7 +616,7 @@
</span><span class="cx"> if (dataTypes & WebsiteDataTypeLocalStorage && m_storageManager) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_storageManager->deleteEntriesForOrigins(origins, [callbackAggregator] {
</del><ins>+ m_storageManager->deleteLocalStorageEntriesForOrigins(origins, [callbackAggregator] {
</ins><span class="cx"> callbackAggregator->removePendingCallback();
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>