Title: [163212] trunk/Source
Revision
163212
Author
[email protected]
Date
2014-01-31 15:28:44 -0800 (Fri, 31 Jan 2014)

Log Message

Expose creation and modification times for LocalStorage
https://bugs.webkit.org/show_bug.cgi?id=128018

Reviewed by Anders Carlsson.

Source/WebCore:

* WebCore.exp.in: Export FileSystem functions to get file times.

Source/WebKit2:

* UIProcess/API/C/WKKeyValueStorageManager.cpp:
(WKKeyValueStorageManagerGetOriginKey):
(WKKeyValueStorageManagerGetCreationTimeKey):
(WKKeyValueStorageManagerGetModificationTimeKey):
(WKKeyValueStorageManagerGetStorageDetailsByOrigin):
* UIProcess/API/C/WKKeyValueStorageManager.h:
* UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
(WebKit::LocalStorageDatabaseTracker::origins):
(WebKit::LocalStorageDatabaseTracker::details):
* UIProcess/Storage/LocalStorageDatabaseTracker.h:
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::getStorageDetailsByOrigin):
(WebKit::StorageManager::getStorageDetailsByOriginInternal):
* UIProcess/Storage/StorageManager.h:
* UIProcess/WebKeyValueStorageManager.cpp:
(WebKit::WebKeyValueStorageManager::originKey):
(WebKit::WebKeyValueStorageManager::creationTimeKey):
(WebKit::WebKeyValueStorageManager::modificationTimeKey):
(WebKit::didGetKeyValueStorageOrigins):
(WebKit::didGetStorageDetailsByOrigin):
(WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
* UIProcess/WebKeyValueStorageManager.h:
* WebKit2.xcodeproj/project.pbxproj:

Modified Paths

Added Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (163211 => 163212)


--- trunk/Source/WebCore/ChangeLog	2014-01-31 23:27:16 UTC (rev 163211)
+++ trunk/Source/WebCore/ChangeLog	2014-01-31 23:28:44 UTC (rev 163212)
@@ -1,3 +1,12 @@
+2014-01-31  Alexey Proskuryakov  <[email protected]>
+
+        Expose creation and modification times for LocalStorage
+        https://bugs.webkit.org/show_bug.cgi?id=128018
+
+        Reviewed by Anders Carlsson.
+
+        * WebCore.exp.in: Export FileSystem functions to get file times.
+
 2014-01-30  Maciej Stachowiak  <[email protected]>
 
         Implement (most of) URL API

Modified: trunk/Source/WebCore/WebCore.exp.in (163211 => 163212)


--- trunk/Source/WebCore/WebCore.exp.in	2014-01-31 23:27:16 UTC (rev 163211)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-01-31 23:28:44 UTC (rev 163212)
@@ -776,6 +776,7 @@
 __ZN7WebCore19TextResourceDecoder6decodeEPKcm
 __ZN7WebCore19TextResourceDecoderC1ERKN3WTF6StringERKNS_12TextEncodingEb
 __ZN7WebCore19TextResourceDecoderD1Ev
+__ZN7WebCore19getFileCreationTimeERKN3WTF6StringERl
 __ZN7WebCore19toInt32EnforceRangeEPN3JSC9ExecStateENS0_7JSValueE
 __ZN7WebCore20CachedResourceLoader31garbageCollectDocumentResourcesEv
 __ZN7WebCore20DictationAlternativeC1Ejjy
@@ -891,6 +892,7 @@
 #if !PLATFORM(IOS)
 __ZN7WebCore23eventTimeStampSince1970EP7NSEvent
 #endif
+__ZN7WebCore23getFileModificationTimeERKN3WTF6StringERl
 __ZN7WebCore23getHostnamesWithCookiesERKNS_21NetworkStorageSessionERN3WTF7HashSetINS3_6StringENS3_10StringHashENS3_10HashTraitsIS5_EEEE
 __ZN7WebCore24CachedResourceHandleBase11setResourceEPNS_14CachedResourceE
 __ZN7WebCore24DocumentMarkerController10markersForEPNS_4NodeENS_14DocumentMarker11MarkerTypesE

Modified: trunk/Source/WebKit2/ChangeLog (163211 => 163212)


--- trunk/Source/WebKit2/ChangeLog	2014-01-31 23:27:16 UTC (rev 163211)
+++ trunk/Source/WebKit2/ChangeLog	2014-01-31 23:28:44 UTC (rev 163212)
@@ -1,3 +1,34 @@
+2014-01-31  Alexey Proskuryakov  <[email protected]>
+
+        Expose creation and modification times for LocalStorage
+        https://bugs.webkit.org/show_bug.cgi?id=128018
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/C/WKKeyValueStorageManager.cpp:
+        (WKKeyValueStorageManagerGetOriginKey):
+        (WKKeyValueStorageManagerGetCreationTimeKey):
+        (WKKeyValueStorageManagerGetModificationTimeKey):
+        (WKKeyValueStorageManagerGetStorageDetailsByOrigin):
+        * UIProcess/API/C/WKKeyValueStorageManager.h:
+        * UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
+        (WebKit::LocalStorageDatabaseTracker::origins):
+        (WebKit::LocalStorageDatabaseTracker::details):
+        * UIProcess/Storage/LocalStorageDatabaseTracker.h:
+        * UIProcess/Storage/StorageManager.cpp:
+        (WebKit::StorageManager::getStorageDetailsByOrigin):
+        (WebKit::StorageManager::getStorageDetailsByOriginInternal):
+        * UIProcess/Storage/StorageManager.h:
+        * UIProcess/WebKeyValueStorageManager.cpp:
+        (WebKit::WebKeyValueStorageManager::originKey):
+        (WebKit::WebKeyValueStorageManager::creationTimeKey):
+        (WebKit::WebKeyValueStorageManager::modificationTimeKey):
+        (WebKit::didGetKeyValueStorageOrigins):
+        (WebKit::didGetStorageDetailsByOrigin):
+        (WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
+        * UIProcess/WebKeyValueStorageManager.h:
+        * WebKit2.xcodeproj/project.pbxproj:
+
 2014-01-31  Anders Carlsson  <[email protected]>
 
         Add webView:didReceiveServerRedirectForProvisionalNavigation:

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp (163211 => 163212)


--- trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp	2014-01-31 23:27:16 UTC (rev 163211)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp	2014-01-31 23:28:44 UTC (rev 163212)
@@ -36,11 +36,34 @@
     return toAPI(WebKeyValueStorageManager::APIType);
 }
 
+WKStringRef WKKeyValueStorageManagerGetOriginKey()
+{
+    static API::String* key = API::String::create(WebKeyValueStorageManager::originKey()).leakRef();
+    return toAPI(key);
+}
+
+WKStringRef WKKeyValueStorageManagerGetCreationTimeKey()
+{
+    static API::String* key = API::String::create(WebKeyValueStorageManager::creationTimeKey()).leakRef();
+    return toAPI(key);
+}
+
+WKStringRef WKKeyValueStorageManagerGetModificationTimeKey()
+{
+    static API::String* key = API::String::create(WebKeyValueStorageManager::modificationTimeKey()).leakRef();
+    return toAPI(key);
+}
+
 void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManagerRef, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction callback)
 {
     toImpl(keyValueStorageManagerRef)->getKeyValueStorageOrigins(ArrayCallback::create(context, callback));
 }
 
+void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManagerRef, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction callback)
+{
+    toImpl(keyValueStorageManagerRef)->getStorageDetailsByOrigin(ArrayCallback::create(context, callback));
+}
+
 void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManagerRef, WKSecurityOriginRef originRef)
 {
     toImpl(keyValueStorageManagerRef)->deleteEntriesForOrigin(toImpl(originRef));

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.h (163211 => 163212)


--- trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.h	2014-01-31 23:27:16 UTC (rev 163211)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.h	2014-01-31 23:28:44 UTC (rev 163212)
@@ -34,9 +34,21 @@
 
 WK_EXPORT WKTypeID WKKeyValueStorageManagerGetTypeID();
 
+/* Value type: WKSecurityOriginRef */
+WK_EXPORT WKStringRef WKKeyValueStorageManagerGetOriginKey();
+
+/* Value type: WKDoubleRef, seconds since January 1st, 1970 UTC */
+WK_EXPORT WKStringRef WKKeyValueStorageManagerGetCreationTimeKey();
+
+/* Value type: WKDoubleRef, seconds since January 1st, 1970 UTC */
+WK_EXPORT WKStringRef WKKeyValueStorageManagerGetModificationTimeKey();
+
 typedef void (*WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction)(WKArrayRef, WKErrorRef, void*);
 WK_EXPORT void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction function);
 
+typedef void (*WKKeyValueStorageManagerGetStorageDetailsByOriginFunction)(WKArrayRef, WKErrorRef, void*);
+WK_EXPORT void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction function);
+
 WK_EXPORT void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, WKSecurityOriginRef origin);
 WK_EXPORT void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef keyValueStorageManager);
 

Copied: trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h (from rev 163210, trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.h) (0 => 163212)


--- trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h	                        (rev 0)
+++ trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h	2014-01-31 23:28:44 UTC (rev 163212)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2014 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 LocalStorageDetails_h
+#define LocalStorageDetails_h
+
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+struct LocalStorageDetails {
+    String originIdentifier;
+    double creationTime;
+    double modificationTime;
+};
+
+} // namespace WebKit
+
+#endif // LocalStorageDetails_h

Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (163211 => 163212)


--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp	2014-01-31 23:27:16 UTC (rev 163211)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp	2014-01-31 23:28:44 UTC (rev 163212)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "LocalStorageDatabaseTracker.h"
 
+#include "LocalStorageDetails.h"
 #include "WorkQueue.h"
 #include <WebCore/FileSystem.h>
 #include <WebCore/SQLiteStatement.h>
@@ -128,12 +129,31 @@
     Vector<RefPtr<SecurityOrigin>> origins;
     origins.reserveInitialCapacity(m_origins.size());
 
-    for (HashSet<String>::const_iterator it = m_origins.begin(), end = m_origins.end(); it != end; ++it)
-        origins.uncheckedAppend(SecurityOrigin::createFromDatabaseIdentifier(*it));
+    for (const String& origin : m_origins)
+        origins.uncheckedAppend(SecurityOrigin::createFromDatabaseIdentifier(origin));
 
     return origins;
 }
 
+Vector<LocalStorageDetails> LocalStorageDatabaseTracker::details()
+{
+    Vector<LocalStorageDetails> result;
+    result.reserveInitialCapacity(m_origins.size());
+
+    for (const String& origin : m_origins) {
+        String filePath = pathForDatabaseWithOriginIdentifier(origin);
+        time_t time;
+
+        LocalStorageDetails details;
+        details.originIdentifier = origin.isolatedCopy();
+        details.creationTime = getFileCreationTime(filePath, time) ? time : 0;
+        details.modificationTime = getFileModificationTime(filePath, time) ? time : 0;
+        result.uncheckedAppend(details);
+    }
+
+    return result;
+}
+
 void LocalStorageDatabaseTracker::setLocalStorageDirectoryInternal(StringImpl* localStorageDirectory)
 {
     if (m_database.isOpen())

Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h (163211 => 163212)


--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h	2014-01-31 23:27:16 UTC (rev 163211)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h	2014-01-31 23:28:44 UTC (rev 163212)
@@ -42,6 +42,8 @@
 
 namespace WebKit {
 
+struct LocalStorageDetails;
+
 class LocalStorageDatabaseTracker : public ThreadSafeRefCounted<LocalStorageDatabaseTracker> {
 public:
     static PassRefPtr<LocalStorageDatabaseTracker> create(PassRefPtr<WorkQueue>);
@@ -55,6 +57,7 @@
     void deleteAllDatabases();
 
     Vector<RefPtr<WebCore::SecurityOrigin>> origins() const;
+    Vector<LocalStorageDetails> details();
 
 private:
     explicit LocalStorageDatabaseTracker(PassRefPtr<WorkQueue>);

Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (163211 => 163212)


--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp	2014-01-31 23:27:16 UTC (rev 163211)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp	2014-01-31 23:28:44 UTC (rev 163212)
@@ -28,6 +28,7 @@
 
 #include "LocalStorageDatabase.h"
 #include "LocalStorageDatabaseTracker.h"
+#include "LocalStorageDetails.h"
 #include "SecurityOriginData.h"
 #include "StorageAreaMapMessages.h"
 #include "StorageManagerMessages.h"
@@ -425,6 +426,11 @@
     m_queue->dispatch(bind(&StorageManager::getOriginsInternal, this, RefPtr<FunctionDispatcher>(callbackDispatcher), context, callback));
 }
 
+void StorageManager::getStorageDetailsByOrigin(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<LocalStorageDetails>& storageDetails, void* context))
+{
+    m_queue->dispatch(bind(&StorageManager::getStorageDetailsByOriginInternal, this, RefPtr<FunctionDispatcher>(callbackDispatcher), context, callback));
+}
+
 void StorageManager::deleteEntriesForOrigin(SecurityOrigin* securityOrigin)
 {
     m_queue->dispatch(bind(&StorageManager::deleteEntriesForOriginInternal, this, RefPtr<SecurityOrigin>(securityOrigin)));
@@ -635,6 +641,12 @@
     dispatcher->dispatch(bind(callCallbackFunction, context, callbackFunction, securityOrigins.leakPtr()));
 }
 
+void StorageManager::getStorageDetailsByOriginInternal(FunctionDispatcher* dispatcher, void* context, void (*callbackFunction)(const Vector<LocalStorageDetails>& storageDetails, void* context))
+{
+    Vector<LocalStorageDetails> storageDetails = m_localStorageDatabaseTracker->details();
+    dispatcher->dispatch(bind(callbackFunction, std::move(storageDetails), context));
+}
+
 void StorageManager::deleteEntriesForOriginInternal(SecurityOrigin* securityOrigin)
 {
     for (auto it = m_localStorageNamespaces.begin(), end = m_localStorageNamespaces.end(); it != end; ++it)

Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (163211 => 163212)


--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h	2014-01-31 23:27:16 UTC (rev 163211)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h	2014-01-31 23:28:44 UTC (rev 163212)
@@ -40,6 +40,7 @@
 
 namespace WebKit {
 
+struct LocalStorageDetails;
 struct SecurityOriginData;
 class LocalStorageDatabaseTracker;
 class WebProcessProxy;
@@ -61,7 +62,8 @@
 
     // FIXME: Instead of a context + C function, this should take a WTF::Function, but we currently don't
     // support arguments in functions.
-    void getOrigins(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context));
+    void getOrigins(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>&, void* context));
+    void getStorageDetailsByOrigin(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<LocalStorageDetails>&, void* context));
     void deleteEntriesForOrigin(WebCore::SecurityOrigin*);
     void deleteAllEntries();
 
@@ -95,7 +97,8 @@
     class LocalStorageNamespace;
     LocalStorageNamespace* getOrCreateLocalStorageNamespace(uint64_t storageNamespaceID);
 
-    void getOriginsInternal(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context));
+    void getOriginsInternal(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>&, void* context));
+    void getStorageDetailsByOriginInternal(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<LocalStorageDetails>&, void* context));
     void deleteEntriesForOriginInternal(WebCore::SecurityOrigin*);
     void deleteAllEntriesInternal();
 

Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp (163211 => 163212)


--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp	2014-01-31 23:27:16 UTC (rev 163211)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp	2014-01-31 23:28:44 UTC (rev 163212)
@@ -27,9 +27,11 @@
 #include "WebKeyValueStorageManager.h"
 
 #include "APIArray.h"
+#include "LocalStorageDetails.h"
 #include "SecurityOriginData.h"
 #include "WebContext.h"
 #include "WebSecurityOrigin.h"
+#include <wtf/NeverDestroyed.h>
 
 using namespace WebCore;
 
@@ -40,6 +42,24 @@
     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(WebContext* context)
 {
     return adoptRef(new WebKeyValueStorageManager(context));
@@ -66,7 +86,7 @@
     API::Object::deref();
 }
 
-static void didGetKeyValueStorageOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context)
+static void didGetKeyValueStorageOrigins(const Vector<RefPtr<SecurityOrigin>>& securityOrigins, void* context)
 {
     RefPtr<ArrayCallback> callback = adoptRef(static_cast<ArrayCallback*>(context));
 
@@ -83,7 +103,36 @@
 {
     context()->storageManager().getOrigins(RunLoop::main(), prpCallback.leakRef(), didGetKeyValueStorageOrigins);
 }
-    
+
+static void didGetStorageDetailsByOrigin(const Vector<LocalStorageDetails>& storageDetails, void* context)
+{
+    RefPtr<ArrayCallback> callback = adoptRef(static_cast<ArrayCallback*>(context));
+
+    Vector<RefPtr<API::Object>> result;
+    result.reserveInitialCapacity(storageDetails.size());
+
+    for (const LocalStorageDetails& originDetails : storageDetails) {
+        HashMap<String, RefPtr<API::Object>> detailsMap;
+
+        RefPtr<API::Object> origin = WebSecurityOrigin::createFromDatabaseIdentifier(originDetails.originIdentifier);
+
+        detailsMap.set(WebKeyValueStorageManager::originKey(), origin);
+        if (originDetails.creationTime)
+            detailsMap.set(WebKeyValueStorageManager::creationTimeKey(), API::Double::create(originDetails.creationTime));
+        if (originDetails.modificationTime)
+            detailsMap.set(WebKeyValueStorageManager::modificationTimeKey(), API::Double::create(originDetails.modificationTime));
+
+        result.uncheckedAppend(ImmutableDictionary::create(std::move(detailsMap)));
+    }
+
+    callback->performCallbackWithReturnValue(API::Array::create(std::move(result)).get());
+}
+
+void WebKeyValueStorageManager::getStorageDetailsByOrigin(PassRefPtr<ArrayCallback> prpCallback)
+{
+    context()->storageManager().getStorageDetailsByOrigin(RunLoop::main(), prpCallback.leakRef(), didGetStorageDetailsByOrigin);
+}
+
 void WebKeyValueStorageManager::deleteEntriesForOrigin(WebSecurityOrigin* origin)
 {
     context()->storageManager().deleteEntriesForOrigin(origin->securityOrigin());

Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h (163211 => 163212)


--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h	2014-01-31 23:27:16 UTC (rev 163211)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h	2014-01-31 23:28:44 UTC (rev 163212)
@@ -46,12 +46,17 @@
     virtual ~WebKeyValueStorageManager();
 
     void getKeyValueStorageOrigins(PassRefPtr<ArrayCallback>);
+    void getStorageDetailsByOrigin(PassRefPtr<ArrayCallback>);
     void deleteEntriesForOrigin(WebSecurityOrigin*);
     void deleteAllEntries();
 
     using API::Object::ref;
     using API::Object::deref;
 
+    static String originKey();
+    static String creationTimeKey();
+    static String modificationTimeKey();
+
 private:
     explicit WebKeyValueStorageManager(WebContext*);
 

Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (163211 => 163212)


--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2014-01-31 23:27:16 UTC (rev 163211)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2014-01-31 23:28:44 UTC (rev 163212)
@@ -1366,6 +1366,7 @@
 		E133FD8A1423DD7F00FC7BFB /* WebKit.icns in Resources */ = {isa = PBXBuildFile; fileRef = E133FD891423DD7F00FC7BFB /* WebKit.icns */; };
 		E134F01712EA5D33004EC58D /* WKPrintingView.h in Headers */ = {isa = PBXBuildFile; fileRef = E134F01512EA5D11004EC58D /* WKPrintingView.h */; };
 		E134F01A12EA5D99004EC58D /* WKPrintingView.mm in Sources */ = {isa = PBXBuildFile; fileRef = E134F01912EA5D99004EC58D /* WKPrintingView.mm */; };
+		E13833EC189C33C8001E2350 /* LocalStorageDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = E13833EB189C33C8001E2350 /* LocalStorageDetails.h */; };
 		E14A954916E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */; };
 		E14A954A16E016A40068DE82 /* NetworkProcessPlatformStrategies.h in Headers */ = {isa = PBXBuildFile; fileRef = E14A954816E016A40068DE82 /* NetworkProcessPlatformStrategies.h */; };
 		E1513C66166EABB200149FCB /* ChildProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1513C64166EABB200149FCB /* ChildProcessProxy.cpp */; };
@@ -3121,6 +3122,7 @@
 		E133FD891423DD7F00FC7BFB /* WebKit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = WebKit.icns; path = Resources/WebKit.icns; sourceTree = "<group>"; };
 		E134F01512EA5D11004EC58D /* WKPrintingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPrintingView.h; sourceTree = "<group>"; };
 		E134F01912EA5D99004EC58D /* WKPrintingView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKPrintingView.mm; sourceTree = "<group>"; };
+		E13833EB189C33C8001E2350 /* LocalStorageDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageDetails.h; sourceTree = "<group>"; };
 		E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessPlatformStrategies.cpp; path = NetworkProcess/NetworkProcessPlatformStrategies.cpp; sourceTree = "<group>"; };
 		E14A954816E016A40068DE82 /* NetworkProcessPlatformStrategies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessPlatformStrategies.h; path = NetworkProcess/NetworkProcessPlatformStrategies.h; sourceTree = "<group>"; };
 		E1513C64166EABB200149FCB /* ChildProcessProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChildProcessProxy.cpp; sourceTree = "<group>"; };
@@ -4935,6 +4937,7 @@
 				BC06F43912DBCCFB002D78DE /* GeolocationPermissionRequestProxy.cpp */,
 				BC06F43812DBCCFB002D78DE /* GeolocationPermissionRequestProxy.h */,
 				BC6EDAA5111271C600E7678B /* PageClient.h */,
+				E13833EB189C33C8001E2350 /* LocalStorageDetails.h */,
 				1AC75379183A9FDA0072CB15 /* PageLoadState.cpp */,
 				1AC7537A183A9FDB0072CB15 /* PageLoadState.h */,
 				BC597074116591D000551FCA /* ProcessModel.h */,
@@ -6745,6 +6748,7 @@
 				518ACAEA12AEE6BB00B04B83 /* WKProtectionSpaceTypes.h in Headers */,
 				37948409150C4B9700E52CE9 /* WKRenderLayer.h in Headers */,
 				37608823150414F700FC82C7 /* WKRenderObject.h in Headers */,
+				E13833EC189C33C8001E2350 /* LocalStorageDetails.h in Headers */,
 				3336763B130C99DC006C9DE2 /* WKResourceCacheManager.h in Headers */,
 				BC8A501511765F5600757573 /* WKRetainPtr.h in Headers */,
 				F634445D12A885E9000612D8 /* WKSecurityOrigin.h in Headers */,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to