<!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>[185623] 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/185623">185623</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-16 15:53:08 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fold WebKeyValueStorageManager into WKKeyValueStorageManager
https://bugs.webkit.org/show_bug.cgi?id=146030
Reviewed by Andreas Kling.
* UIProcess/API/C/WKAPICast.h:
* UIProcess/API/C/WKContext.cpp:
(WKContextGetKeyValueStorageManager):
* UIProcess/API/C/WKKeyValueStorageManager.cpp:
(WKKeyValueStorageManagerGetTypeID):
(WKKeyValueStorageManagerGetOriginKey):
(WKKeyValueStorageManagerGetCreationTimeKey):
(WKKeyValueStorageManagerGetModificationTimeKey):
(WKKeyValueStorageManagerGetKeyValueStorageOrigins):
(WKKeyValueStorageManagerGetStorageDetailsByOrigin):
(WKKeyValueStorageManagerDeleteEntriesForOrigin):
(WKKeyValueStorageManagerDeleteAllEntries):
* UIProcess/WebKeyValueStorageManager.cpp: Removed.
(WebKit::WebKeyValueStorageManager::supplementName): Deleted.
(WebKit::WebKeyValueStorageManager::originKey): Deleted.
(WebKit::WebKeyValueStorageManager::creationTimeKey): Deleted.
(WebKit::WebKeyValueStorageManager::modificationTimeKey): Deleted.
(WebKit::WebKeyValueStorageManager::create): Deleted.
(WebKit::WebKeyValueStorageManager::WebKeyValueStorageManager): Deleted.
(WebKit::WebKeyValueStorageManager::~WebKeyValueStorageManager): Deleted.
(WebKit::WebKeyValueStorageManager::refWebContextSupplement): Deleted.
(WebKit::WebKeyValueStorageManager::derefWebContextSupplement): Deleted.
(WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins): Deleted.
(WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin): Deleted.
(WebKit::WebKeyValueStorageManager::deleteEntriesForOrigin): Deleted.
(WebKit::WebKeyValueStorageManager::deleteAllEntries): Deleted.
* UIProcess/WebKeyValueStorageManager.h: Removed.
* UIProcess/WebProcessPool.cpp:
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKAPICasth">trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp">trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebKeyValueStorageManagerh">trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185622 => 185623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-16 22:39:29 UTC (rev 185622)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-16 22:53:08 UTC (rev 185623)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-06-16 Anders Carlsson <andersca@apple.com>
+
+ Fold WebKeyValueStorageManager into WKKeyValueStorageManager
+ https://bugs.webkit.org/show_bug.cgi?id=146030
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/API/C/WKAPICast.h:
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextGetKeyValueStorageManager):
+ * UIProcess/API/C/WKKeyValueStorageManager.cpp:
+ (WKKeyValueStorageManagerGetTypeID):
+ (WKKeyValueStorageManagerGetOriginKey):
+ (WKKeyValueStorageManagerGetCreationTimeKey):
+ (WKKeyValueStorageManagerGetModificationTimeKey):
+ (WKKeyValueStorageManagerGetKeyValueStorageOrigins):
+ (WKKeyValueStorageManagerGetStorageDetailsByOrigin):
+ (WKKeyValueStorageManagerDeleteEntriesForOrigin):
+ (WKKeyValueStorageManagerDeleteAllEntries):
+ * UIProcess/WebKeyValueStorageManager.cpp: Removed.
+ (WebKit::WebKeyValueStorageManager::supplementName): Deleted.
+ (WebKit::WebKeyValueStorageManager::originKey): Deleted.
+ (WebKit::WebKeyValueStorageManager::creationTimeKey): Deleted.
+ (WebKit::WebKeyValueStorageManager::modificationTimeKey): Deleted.
+ (WebKit::WebKeyValueStorageManager::create): Deleted.
+ (WebKit::WebKeyValueStorageManager::WebKeyValueStorageManager): Deleted.
+ (WebKit::WebKeyValueStorageManager::~WebKeyValueStorageManager): Deleted.
+ (WebKit::WebKeyValueStorageManager::refWebContextSupplement): Deleted.
+ (WebKit::WebKeyValueStorageManager::derefWebContextSupplement): Deleted.
+ (WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins): Deleted.
+ (WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin): Deleted.
+ (WebKit::WebKeyValueStorageManager::deleteEntriesForOrigin): Deleted.
+ (WebKit::WebKeyValueStorageManager::deleteAllEntries): Deleted.
+ * UIProcess/WebKeyValueStorageManager.h: Removed.
+ * UIProcess/WebProcessPool.cpp:
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-06-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> CMake build fix after r185615.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (185622 => 185623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-06-16 22:39:29 UTC (rev 185622)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-06-16 22:53:08 UTC (rev 185623)
</span><span class="lines">@@ -91,7 +91,6 @@
</span><span class="cx"> class WebHitTestResult;
</span><span class="cx"> class WebIconDatabase;
</span><span class="cx"> class WebInspectorProxy;
</span><del>-class WebKeyValueStorageManager;
</del><span class="cx"> class WebMediaCacheManagerProxy;
</span><span class="cx"> class WebNotification;
</span><span class="cx"> class WebNotificationManagerProxy;
</span><span class="lines">@@ -135,7 +134,6 @@
</span><span class="cx"> WK_ADD_API_MAPPING(WKHitTestResultRef, WebHitTestResult)
</span><span class="cx"> WK_ADD_API_MAPPING(WKIconDatabaseRef, WebIconDatabase)
</span><span class="cx"> WK_ADD_API_MAPPING(WKInspectorRef, WebInspectorProxy)
</span><del>-WK_ADD_API_MAPPING(WKKeyValueStorageManagerRef, WebKeyValueStorageManager)
</del><span class="cx"> WK_ADD_API_MAPPING(WKMediaCacheManagerRef, WebMediaCacheManagerProxy)
</span><span class="cx"> WK_ADD_API_MAPPING(WKNavigationActionRef, API::NavigationAction)
</span><span class="cx"> WK_ADD_API_MAPPING(WKNavigationDataRef, API::NavigationData)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (185622 => 185623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-06-16 22:39:29 UTC (rev 185622)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-06-16 22:53:08 UTC (rev 185623)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> #include "WebCookieManagerProxy.h"
</span><span class="cx"> #include "WebDatabaseManagerProxy.h"
</span><span class="cx"> #include "WebGeolocationManagerProxy.h"
</span><del>-#include "WebKeyValueStorageManager.h"
</del><span class="cx"> #include "WebMediaCacheManagerProxy.h"
</span><span class="cx"> #include "WebNotificationManagerProxy.h"
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="lines">@@ -445,9 +444,9 @@
</span><span class="cx"> return toAPI(toImpl(contextRef)->iconDatabase());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WKKeyValueStorageManagerRef WKContextGetKeyValueStorageManager(WKContextRef contextRef)
</del><ins>+WKKeyValueStorageManagerRef WKContextGetKeyValueStorageManager(WKContextRef context)
</ins><span class="cx"> {
</span><del>- return toAPI(toImpl(contextRef)->supplement<WebKeyValueStorageManager>());
</del><ins>+ return reinterpret_cast<WKKeyValueStorageManagerRef>(WKContextGetWebsiteDataStore(context));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKMediaCacheManagerRef WKContextGetMediaCacheManager(WKContextRef contextRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp (185622 => 185623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp 2015-06-16 22:39:29 UTC (rev 185622)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp 2015-06-16 22:53:08 UTC (rev 185623)
</span><span class="lines">@@ -26,50 +26,107 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKKeyValueStorageManager.h"
</span><span class="cx">
</span><ins>+#include "APIDictionary.h"
+#include "APIWebsiteDataStore.h"
+#include "LocalStorageDetails.h"
+#include "StorageManager.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WebKeyValueStorageManager.h"
</del><ins>+#include "WebsiteDataStore.h"
+#include <wtf/RunLoop.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> WKTypeID WKKeyValueStorageManagerGetTypeID()
</span><span class="cx"> {
</span><del>- return toAPI(WebKeyValueStorageManager::APIType);
</del><ins>+ return toAPI(API::WebsiteDataStore::APIType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKKeyValueStorageManagerGetOriginKey()
</span><span class="cx"> {
</span><del>- static API::String& key = API::String::create(WebKeyValueStorageManager::originKey()).leakRef();
</del><ins>+ static API::String& key = API::String::create("WebKeyValueStorageManagerStorageDetailsOriginKey").leakRef();
</ins><span class="cx"> return toAPI(&key);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKKeyValueStorageManagerGetCreationTimeKey()
</span><span class="cx"> {
</span><del>- static API::String& key = API::String::create(WebKeyValueStorageManager::creationTimeKey()).leakRef();
</del><ins>+ static API::String& key = API::String::create("WebKeyValueStorageManagerStorageDetailsCreationTimeKey").leakRef();
</ins><span class="cx"> return toAPI(&key);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKKeyValueStorageManagerGetModificationTimeKey()
</span><span class="cx"> {
</span><del>- static API::String& key = API::String::create(WebKeyValueStorageManager::modificationTimeKey()).leakRef();
</del><ins>+ static API::String& key = API::String::create("WebKeyValueStorageManagerStorageDetailsModificationTimeKey").leakRef();
</ins><span class="cx"> return toAPI(&key);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManagerRef, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction callback)
</del><ins>+void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction callback)
+
</ins><span class="cx"> {
</span><del>- toImpl(keyValueStorageManagerRef)->getKeyValueStorageOrigins(toGenericCallbackFunction(context, callback));
</del><ins>+ StorageManager* storageManager = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore().storageManager();
+ if (!storageManager) {
+ RunLoop::main().dispatch([context, callback] {
+ callback(toAPI(API::Array::create().ptr()), nullptr, context);
+ });
+ return;
+ }
+
+ storageManager->getLocalStorageOrigins([context, callback](HashSet<RefPtr<WebCore::SecurityOrigin>>&& securityOrigins) {
+ Vector<RefPtr<API::Object>> webSecurityOrigins;
+ webSecurityOrigins.reserveInitialCapacity(securityOrigins.size());
+ for (auto& origin : securityOrigins)
+ webSecurityOrigins.uncheckedAppend(API::SecurityOrigin::create(origin));
+
+ callback(toAPI(API::Array::create(WTF::move(webSecurityOrigins)).ptr()), nullptr, context);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManagerRef, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction callback)
</del><ins>+void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction callback)
</ins><span class="cx"> {
</span><del>- toImpl(keyValueStorageManagerRef)->getStorageDetailsByOrigin(toGenericCallbackFunction(context, callback));
</del><ins>+ StorageManager* storageManager = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore().storageManager();
+ if (!storageManager) {
+ RunLoop::main().dispatch([context, callback] {
+ callback(toAPI(API::Array::create().ptr()), nullptr, context);
+ });
+ return;
+ }
+
+ storageManager->getLocalStorageDetailsByOrigin([context, callback](Vector<LocalStorageDetails> storageDetails) {
+ HashMap<String, RefPtr<API::Object>> detailsMap;
+ Vector<RefPtr<API::Object>> result;
+ result.reserveInitialCapacity(storageDetails.size());
+
+ for (const LocalStorageDetails& originDetails : storageDetails) {
+ HashMap<String, RefPtr<API::Object>> detailsMap;
+
+ RefPtr<API::Object> origin = API::SecurityOrigin::create(WebCore::SecurityOrigin::createFromDatabaseIdentifier(originDetails.originIdentifier));
+
+ detailsMap.set(toImpl(WKKeyValueStorageManagerGetOriginKey())->string(), origin);
+ if (originDetails.creationTime)
+ detailsMap.set(toImpl(WKKeyValueStorageManagerGetCreationTimeKey())->string(), API::Double::create(originDetails.creationTime.valueOr(0)));
+ if (originDetails.modificationTime)
+ detailsMap.set(toImpl(WKKeyValueStorageManagerGetModificationTimeKey())->string(), API::Double::create(originDetails.modificationTime.valueOr(0)));
+
+ result.uncheckedAppend(API::Dictionary::create(WTF::move(detailsMap)));
+ }
+
+ callback(toAPI(API::Array::create(WTF::move(result)).ptr()), nullptr, context);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManagerRef, WKSecurityOriginRef originRef)
</del><ins>+void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, WKSecurityOriginRef origin)
</ins><span class="cx"> {
</span><del>- toImpl(keyValueStorageManagerRef)->deleteEntriesForOrigin(toImpl(originRef));
</del><ins>+ StorageManager* storageManager = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore().storageManager();
+ if (!storageManager)
+ return;
+
+ storageManager->deleteLocalStorageEntriesForOrigin(toImpl(origin)->securityOrigin());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef keyValueStorageManagerRef)
</del><ins>+void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef keyValueStorageManager)
</ins><span class="cx"> {
</span><del>- toImpl(keyValueStorageManagerRef)->deleteAllEntries();
</del><ins>+ StorageManager* storageManager = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore().storageManager();
+ if (!storageManager)
+ return;
+
+ storageManager->deleteAllLocalStorageEntries();
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp (185622 => 185623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2015-06-16 22:39:29 UTC (rev 185622)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2015-06-16 22:53:08 UTC (rev 185623)
</span><span class="lines">@@ -1,162 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebKeyValueStorageManager.h"
-
-#include "APIArray.h"
-#include "APISecurityOrigin.h"
-#include "APIWebsiteDataStore.h"
-#include "LocalStorageDetails.h"
-#include "SecurityOriginData.h"
-#include "StorageManager.h"
-#include "WebProcessPool.h"
-#include <wtf/NeverDestroyed.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-const char* WebKeyValueStorageManager::supplementName()
-{
- return "WebKeyValueStorageManager";
-}
-
-String WebKeyValueStorageManager::originKey()
-{
- static NeverDestroyed<String> key(ASCIILiteral("WebKeyValueStorageManagerStorageDetailsOriginKey"));
- return key;
-}
-
-String WebKeyValueStorageManager::creationTimeKey()
-{
- static NeverDestroyed<String> key(ASCIILiteral("WebKeyValueStorageManagerStorageDetailsCreationTimeKey"));
- return key;
-}
-
-String WebKeyValueStorageManager::modificationTimeKey()
-{
- static NeverDestroyed<String> key(ASCIILiteral("WebKeyValueStorageManagerStorageDetailsModificationTimeKey"));
- return key;
-}
-
-PassRefPtr<WebKeyValueStorageManager> WebKeyValueStorageManager::create(WebProcessPool* processPool)
-{
- return adoptRef(new WebKeyValueStorageManager(processPool));
-}
-
-WebKeyValueStorageManager::WebKeyValueStorageManager(WebProcessPool* processPool)
- : WebContextSupplement(processPool)
-{
-}
-
-WebKeyValueStorageManager::~WebKeyValueStorageManager()
-{
-}
-
-// WebContextSupplement
-
-void WebKeyValueStorageManager::refWebContextSupplement()
-{
- API::Object::ref();
-}
-
-void WebKeyValueStorageManager::derefWebContextSupplement()
-{
- API::Object::deref();
-}
-
-void WebKeyValueStorageManager::getKeyValueStorageOrigins(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
-{
- StorageManager* storageManager = processPool()->websiteDataStore()->websiteDataStore().storageManager();
- if (!storageManager) {
- RunLoop::main().dispatch([callbackFunction] {
- callbackFunction(API::Array::create().ptr(), CallbackBase::Error::None);
- });
- return;
- }
-
- storageManager->getLocalStorageOrigins([callbackFunction](HashSet<RefPtr<SecurityOrigin>>&& securityOrigins) {
- Vector<RefPtr<API::Object>> webSecurityOrigins;
- webSecurityOrigins.reserveInitialCapacity(securityOrigins.size());
- for (auto& origin : securityOrigins)
- webSecurityOrigins.uncheckedAppend(API::SecurityOrigin::create(origin));
-
- callbackFunction(API::Array::create(WTF::move(webSecurityOrigins)).ptr(), CallbackBase::Error::None);
- });
-}
-
-void WebKeyValueStorageManager::getStorageDetailsByOrigin(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
-{
- StorageManager* storageManager = processPool()->websiteDataStore()->websiteDataStore().storageManager();
- if (!storageManager) {
- RunLoop::main().dispatch([callbackFunction] {
- callbackFunction(API::Array::create().ptr(), CallbackBase::Error::None);
- });
- return;
- }
-
- storageManager->getLocalStorageDetailsByOrigin([callbackFunction](Vector<LocalStorageDetails> storageDetails) {
- HashMap<String, RefPtr<API::Object>> detailsMap;
- Vector<RefPtr<API::Object>> result;
- result.reserveInitialCapacity(storageDetails.size());
-
- for (const LocalStorageDetails& originDetails : storageDetails) {
- HashMap<String, RefPtr<API::Object>> detailsMap;
-
- RefPtr<API::Object> origin = API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originDetails.originIdentifier));
-
- detailsMap.set(WebKeyValueStorageManager::originKey(), origin);
- if (originDetails.creationTime)
- detailsMap.set(WebKeyValueStorageManager::creationTimeKey(), API::Double::create(originDetails.creationTime.valueOr(0)));
- if (originDetails.modificationTime)
- detailsMap.set(WebKeyValueStorageManager::modificationTimeKey(), API::Double::create(originDetails.modificationTime.valueOr(0)));
-
- result.uncheckedAppend(API::Dictionary::create(WTF::move(detailsMap)));
- }
-
- callbackFunction(API::Array::create(WTF::move(result)).ptr(), CallbackBase::Error::None);
- });
-}
-
-void WebKeyValueStorageManager::deleteEntriesForOrigin(API::SecurityOrigin* origin)
-{
- StorageManager* storageManager = processPool()->websiteDataStore()->websiteDataStore().storageManager();
- if (!storageManager)
- return;
-
- storageManager->deleteLocalStorageEntriesForOrigin(origin->securityOrigin());
-}
-
-void WebKeyValueStorageManager::deleteAllEntries()
-{
- StorageManager* storageManager = processPool()->websiteDataStore()->websiteDataStore().storageManager();
- if (!storageManager)
- return;
-
- storageManager->deleteAllLocalStorageEntries();
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebKeyValueStorageManagerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h (185622 => 185623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h 2015-06-16 22:39:29 UTC (rev 185622)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h 2015-06-16 22:53:08 UTC (rev 185623)
</span><span class="lines">@@ -1,71 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebKeyValueStorageManager_h
-#define WebKeyValueStorageManager_h
-
-#include "APIObject.h"
-#include "GenericCallback.h"
-#include "MessageReceiver.h"
-#include "WebContextSupplement.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-
-namespace WebKit {
-
-class WebProcessPool;
-typedef GenericCallback<API::Array*> ArrayCallback;
-
-class WebKeyValueStorageManager : public API::ObjectImpl<API::Object::Type::KeyValueStorageManager>, public WebContextSupplement {
-public:
- static const char* supplementName();
-
- static PassRefPtr<WebKeyValueStorageManager> create(WebProcessPool*);
- virtual ~WebKeyValueStorageManager();
-
- void getKeyValueStorageOrigins(std::function<void (API::Array*, CallbackBase::Error)>);
- void getStorageDetailsByOrigin(std::function<void (API::Array*, CallbackBase::Error)>);
- void deleteEntriesForOrigin(API::SecurityOrigin*);
- void deleteAllEntries();
-
- using API::Object::ref;
- using API::Object::deref;
-
- static String originKey();
- static String creationTimeKey();
- static String modificationTimeKey();
-
-private:
- explicit WebKeyValueStorageManager(WebProcessPool*);
-
- // WebContextSupplement
- virtual void refWebContextSupplement() override;
- virtual void derefWebContextSupplement() override;
-};
-
-} // namespace WebKit
-
-#endif // WebKeyValueStorageManager_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (185622 => 185623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-06-16 22:39:29 UTC (rev 185622)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-06-16 22:53:08 UTC (rev 185623)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> #include "WebDatabaseManagerProxy.h"
</span><span class="cx"> #include "WebGeolocationManagerProxy.h"
</span><span class="cx"> #include "WebIconDatabase.h"
</span><del>-#include "WebKeyValueStorageManager.h"
</del><span class="cx"> #include "WebKit2Initialize.h"
</span><span class="cx"> #include "WebMediaCacheManagerProxy.h"
</span><span class="cx"> #include "WebMemorySampler.h"
</span><span class="lines">@@ -193,7 +192,6 @@
</span><span class="cx">
</span><span class="cx"> addSupplement<WebCookieManagerProxy>();
</span><span class="cx"> addSupplement<WebGeolocationManagerProxy>();
</span><del>- addSupplement<WebKeyValueStorageManager>();
</del><span class="cx"> addSupplement<WebMediaCacheManagerProxy>();
</span><span class="cx"> addSupplement<WebNotificationManagerProxy>();
</span><span class="cx"> addSupplement<WebDatabaseManagerProxy>();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (185622 => 185623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-16 22:39:29 UTC (rev 185622)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-16 22:53:08 UTC (rev 185623)
</span><span class="lines">@@ -998,8 +998,6 @@
</span><span class="cx"> 51A7F2F3125BF820008AEB1D /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A7F2F2125BF820008AEB1D /* Logging.h */; };
</span><span class="cx"> 51A7F2F5125BF8D4008AEB1D /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A7F2F4125BF8D4008AEB1D /* Logging.cpp */; };
</span><span class="cx"> 51A84CE3127F386B00CA6EA4 /* WebContextMenuProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A84CE2127F386B00CA6EA4 /* WebContextMenuProxy.cpp */; };
</span><del>- 51A9E1051315CCFC009E7031 /* WebKeyValueStorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A9E1021315CCFC009E7031 /* WebKeyValueStorageManager.cpp */; };
- 51A9E1061315CCFC009E7031 /* WebKeyValueStorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A9E1031315CCFC009E7031 /* WebKeyValueStorageManager.h */; };
</del><span class="cx"> 51A9E10A1315CD18009E7031 /* WKKeyValueStorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A9E1081315CD18009E7031 /* WKKeyValueStorageManager.cpp */; };
</span><span class="cx"> 51A9E10B1315CD18009E7031 /* WKKeyValueStorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A9E1091315CD18009E7031 /* WKKeyValueStorageManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 51ACBB82127A8BAD00D203B9 /* WebContextMenuProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACBB81127A8BAD00D203B9 /* WebContextMenuProxy.h */; };
</span><span class="lines">@@ -3177,8 +3175,6 @@
</span><span class="cx"> 51A8A6121627F325000D90E9 /* NetworkProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessCreationParameters.cpp; path = Network/NetworkProcessCreationParameters.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51A8A6151627F3F9000D90E9 /* NetworkProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkProcessMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 51A8A6171627F5BB000D90E9 /* NetworkProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkProcess.messages.in; path = NetworkProcess/NetworkProcess.messages.in; sourceTree = "<group>"; };
</span><del>- 51A9E1021315CCFC009E7031 /* WebKeyValueStorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKeyValueStorageManager.cpp; sourceTree = "<group>"; };
- 51A9E1031315CCFC009E7031 /* WebKeyValueStorageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKeyValueStorageManager.h; sourceTree = "<group>"; };
</del><span class="cx"> 51A9E1081315CD18009E7031 /* WKKeyValueStorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKKeyValueStorageManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51A9E1091315CD18009E7031 /* WKKeyValueStorageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKKeyValueStorageManager.h; sourceTree = "<group>"; };
</span><span class="cx"> 51ABF65616392F1500132A7A /* WebResourceLoadScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebResourceLoadScheduler.cpp; path = Network/WebResourceLoadScheduler.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -6179,8 +6175,6 @@
</span><span class="cx"> 1C8E28331275D73800BC7BD0 /* WebInspectorProxy.cpp */,
</span><span class="cx"> 1C8E28321275D73800BC7BD0 /* WebInspectorProxy.h */,
</span><span class="cx"> 1C77C1951288A872006A742F /* WebInspectorProxy.messages.in */,
</span><del>- 51A9E1021315CCFC009E7031 /* WebKeyValueStorageManager.cpp */,
- 51A9E1031315CCFC009E7031 /* WebKeyValueStorageManager.h */,
</del><span class="cx"> 33D3A3B71339606200709BE4 /* WebMediaCacheManagerProxy.cpp */,
</span><span class="cx"> 33D3A3B81339606200709BE4 /* WebMediaCacheManagerProxy.h */,
</span><span class="cx"> 33D3A3B91339606200709BE4 /* WebMediaCacheManagerProxy.messages.in */,
</span><span class="lines">@@ -7986,7 +7980,6 @@
</span><span class="cx"> 1CBBE4A119B66C53006B7D81 /* WebInspectorUIMessages.h in Headers */,
</span><span class="cx"> 1AA654D11B14F71400BF1D3E /* WKWebsiteDataRecordPrivate.h in Headers */,
</span><span class="cx"> 2DA944A01884E4F000ED86DB /* WebIOSEventFactory.h in Headers */,
</span><del>- 51A9E1061315CCFC009E7031 /* WebKeyValueStorageManager.h in Headers */,
</del><span class="cx"> 1A6280C51919949F006AD9F9 /* WebKit.h in Headers */,
</span><span class="cx"> BC59548915C7868500FD1E3E /* WebKit2.h in Headers */,
</span><span class="cx"> BCB63478116BF10600603215 /* WebKit2_C.h in Headers */,
</span><span class="lines">@@ -9820,7 +9813,6 @@
</span><span class="cx"> 1CBBE4A019B66C53006B7D81 /* WebInspectorUIMessageReceiver.cpp in Sources */,
</span><span class="cx"> 2DA944A11884E4F000ED86DB /* WebIOSEventFactory.mm in Sources */,
</span><span class="cx"> C0337DD3127A2A0E008FF4F4 /* WebKeyboardEvent.cpp in Sources */,
</span><del>- 51A9E1051315CCFC009E7031 /* WebKeyValueStorageManager.cpp in Sources */,
</del><span class="cx"> 1A6280F31919982A006AD9F9 /* WebKit.m in Sources */,
</span><span class="cx"> BC9BA5041697C45300E44616 /* WebKit2Initialize.cpp in Sources */,
</span><span class="cx"> 33D3A3C1133960B000709BE4 /* WebMediaCacheManager.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>