<!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>[163212] trunk/Source</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/163212">163212</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-01-31 15:28:44 -0800 (Fri, 31 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagerh">trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackercpp">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackerh">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h</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="#trunkSourceWebKit2UIProcessWebKeyValueStorageManagerh">trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessLocalStorageDetailsh">trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163211 => 163212)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-31 Alexey Proskuryakov <ap@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2014-01-30 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement (most of) URL API
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (163211 => 163212)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -776,6 +776,7 @@
</span><span class="cx"> __ZN7WebCore19TextResourceDecoder6decodeEPKcm
</span><span class="cx"> __ZN7WebCore19TextResourceDecoderC1ERKN3WTF6StringERKNS_12TextEncodingEb
</span><span class="cx"> __ZN7WebCore19TextResourceDecoderD1Ev
</span><ins>+__ZN7WebCore19getFileCreationTimeERKN3WTF6StringERl
</ins><span class="cx"> __ZN7WebCore19toInt32EnforceRangeEPN3JSC9ExecStateENS0_7JSValueE
</span><span class="cx"> __ZN7WebCore20CachedResourceLoader31garbageCollectDocumentResourcesEv
</span><span class="cx"> __ZN7WebCore20DictationAlternativeC1Ejjy
</span><span class="lines">@@ -891,6 +892,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> __ZN7WebCore23eventTimeStampSince1970EP7NSEvent
</span><span class="cx"> #endif
</span><ins>+__ZN7WebCore23getFileModificationTimeERKN3WTF6StringERl
</ins><span class="cx"> __ZN7WebCore23getHostnamesWithCookiesERKNS_21NetworkStorageSessionERN3WTF7HashSetINS3_6StringENS3_10StringHashENS3_10HashTraitsIS5_EEEE
</span><span class="cx"> __ZN7WebCore24CachedResourceHandleBase11setResourceEPNS_14CachedResourceE
</span><span class="cx"> __ZN7WebCore24DocumentMarkerController10markersForEPNS_4NodeENS_14DocumentMarker11MarkerTypesE
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163211 => 163212)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-01-31 Alexey Proskuryakov <ap@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-01-31 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add webView:didReceiveServerRedirectForProvisionalNavigation:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp (163211 => 163212)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -36,11 +36,34 @@
</span><span class="cx"> return toAPI(WebKeyValueStorageManager::APIType);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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);
+}
+
</ins><span class="cx"> void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManagerRef, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction callback)
</span><span class="cx"> {
</span><span class="cx"> toImpl(keyValueStorageManagerRef)->getKeyValueStorageOrigins(ArrayCallback::create(context, callback));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManagerRef, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction callback)
+{
+ toImpl(keyValueStorageManagerRef)->getStorageDetailsByOrigin(ArrayCallback::create(context, callback));
+}
+
</ins><span class="cx"> void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManagerRef, WKSecurityOriginRef originRef)
</span><span class="cx"> {
</span><span class="cx"> toImpl(keyValueStorageManagerRef)->deleteEntriesForOrigin(toImpl(originRef));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.h (163211 => 163212)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,9 +34,21 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKKeyValueStorageManagerGetTypeID();
</span><span class="cx">
</span><ins>+/* 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();
+
</ins><span class="cx"> typedef void (*WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction)(WKArrayRef, WKErrorRef, void*);
</span><span class="cx"> WK_EXPORT void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction function);
</span><span class="cx">
</span><ins>+typedef void (*WKKeyValueStorageManagerGetStorageDetailsByOriginFunction)(WKArrayRef, WKErrorRef, void*);
+WK_EXPORT void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction function);
+
</ins><span class="cx"> WK_EXPORT void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, WKSecurityOriginRef origin);
</span><span class="cx"> WK_EXPORT void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef keyValueStorageManager);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLocalStorageDetailshfromrev163210trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h (from rev 163210, trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.h) (0 => 163212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h 2014-01-31 23:28:44 UTC (rev 163212)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (163211 => 163212)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "LocalStorageDatabaseTracker.h"
</span><span class="cx">
</span><ins>+#include "LocalStorageDetails.h"
</ins><span class="cx"> #include "WorkQueue.h"
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/SQLiteStatement.h>
</span><span class="lines">@@ -128,12 +129,31 @@
</span><span class="cx"> Vector<RefPtr<SecurityOrigin>> origins;
</span><span class="cx"> origins.reserveInitialCapacity(m_origins.size());
</span><span class="cx">
</span><del>- for (HashSet<String>::const_iterator it = m_origins.begin(), end = m_origins.end(); it != end; ++it)
- origins.uncheckedAppend(SecurityOrigin::createFromDatabaseIdentifier(*it));
</del><ins>+ for (const String& origin : m_origins)
+ origins.uncheckedAppend(SecurityOrigin::createFromDatabaseIdentifier(origin));
</ins><span class="cx">
</span><span class="cx"> return origins;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> void LocalStorageDatabaseTracker::setLocalStorageDirectoryInternal(StringImpl* localStorageDirectory)
</span><span class="cx"> {
</span><span class="cx"> if (m_database.isOpen())
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h (163211 => 163212)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+struct LocalStorageDetails;
+
</ins><span class="cx"> class LocalStorageDatabaseTracker : public ThreadSafeRefCounted<LocalStorageDatabaseTracker> {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<LocalStorageDatabaseTracker> create(PassRefPtr<WorkQueue>);
</span><span class="lines">@@ -55,6 +57,7 @@
</span><span class="cx"> void deleteAllDatabases();
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> origins() const;
</span><ins>+ Vector<LocalStorageDetails> details();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit LocalStorageDatabaseTracker(PassRefPtr<WorkQueue>);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (163211 => 163212)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "LocalStorageDatabase.h"
</span><span class="cx"> #include "LocalStorageDatabaseTracker.h"
</span><ins>+#include "LocalStorageDetails.h"
</ins><span class="cx"> #include "SecurityOriginData.h"
</span><span class="cx"> #include "StorageAreaMapMessages.h"
</span><span class="cx"> #include "StorageManagerMessages.h"
</span><span class="lines">@@ -425,6 +426,11 @@
</span><span class="cx"> m_queue->dispatch(bind(&StorageManager::getOriginsInternal, this, RefPtr<FunctionDispatcher>(callbackDispatcher), context, callback));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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));
+}
+
</ins><span class="cx"> void StorageManager::deleteEntriesForOrigin(SecurityOrigin* securityOrigin)
</span><span class="cx"> {
</span><span class="cx"> m_queue->dispatch(bind(&StorageManager::deleteEntriesForOriginInternal, this, RefPtr<SecurityOrigin>(securityOrigin)));
</span><span class="lines">@@ -635,6 +641,12 @@
</span><span class="cx"> dispatcher->dispatch(bind(callCallbackFunction, context, callbackFunction, securityOrigins.leakPtr()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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));
+}
+
</ins><span class="cx"> void StorageManager::deleteEntriesForOriginInternal(SecurityOrigin* securityOrigin)
</span><span class="cx"> {
</span><span class="cx"> for (auto it = m_localStorageNamespaces.begin(), end = m_localStorageNamespaces.end(); it != end; ++it)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (163211 => 163212)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+struct LocalStorageDetails;
</ins><span class="cx"> struct SecurityOriginData;
</span><span class="cx"> class LocalStorageDatabaseTracker;
</span><span class="cx"> class WebProcessProxy;
</span><span class="lines">@@ -61,7 +62,8 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Instead of a context + C function, this should take a WTF::Function, but we currently don't
</span><span class="cx"> // support arguments in functions.
</span><del>- void getOrigins(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context));
</del><ins>+ 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));
</ins><span class="cx"> void deleteEntriesForOrigin(WebCore::SecurityOrigin*);
</span><span class="cx"> void deleteAllEntries();
</span><span class="cx">
</span><span class="lines">@@ -95,7 +97,8 @@
</span><span class="cx"> class LocalStorageNamespace;
</span><span class="cx"> LocalStorageNamespace* getOrCreateLocalStorageNamespace(uint64_t storageNamespaceID);
</span><span class="cx">
</span><del>- void getOriginsInternal(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context));
</del><ins>+ 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));
</ins><span class="cx"> void deleteEntriesForOriginInternal(WebCore::SecurityOrigin*);
</span><span class="cx"> void deleteAllEntriesInternal();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp (163211 => 163212)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,9 +27,11 @@
</span><span class="cx"> #include "WebKeyValueStorageManager.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "LocalStorageDetails.h"
</ins><span class="cx"> #include "SecurityOriginData.h"
</span><span class="cx"> #include "WebContext.h"
</span><span class="cx"> #include "WebSecurityOrigin.h"
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -40,6 +42,24 @@
</span><span class="cx"> return "WebKeyValueStorageManager";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> PassRefPtr<WebKeyValueStorageManager> WebKeyValueStorageManager::create(WebContext* context)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(new WebKeyValueStorageManager(context));
</span><span class="lines">@@ -66,7 +86,7 @@
</span><span class="cx"> API::Object::deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void didGetKeyValueStorageOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context)
</del><ins>+static void didGetKeyValueStorageOrigins(const Vector<RefPtr<SecurityOrigin>>& securityOrigins, void* context)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ArrayCallback> callback = adoptRef(static_cast<ArrayCallback*>(context));
</span><span class="cx">
</span><span class="lines">@@ -83,7 +103,36 @@
</span><span class="cx"> {
</span><span class="cx"> context()->storageManager().getOrigins(RunLoop::main(), prpCallback.leakRef(), didGetKeyValueStorageOrigins);
</span><span class="cx"> }
</span><del>-
</del><ins>+
+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);
+}
+
</ins><span class="cx"> void WebKeyValueStorageManager::deleteEntriesForOrigin(WebSecurityOrigin* origin)
</span><span class="cx"> {
</span><span class="cx"> context()->storageManager().deleteEntriesForOrigin(origin->securityOrigin());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebKeyValueStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h (163211 => 163212)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,12 +46,17 @@
</span><span class="cx"> virtual ~WebKeyValueStorageManager();
</span><span class="cx">
</span><span class="cx"> void getKeyValueStorageOrigins(PassRefPtr<ArrayCallback>);
</span><ins>+ void getStorageDetailsByOrigin(PassRefPtr<ArrayCallback>);
</ins><span class="cx"> void deleteEntriesForOrigin(WebSecurityOrigin*);
</span><span class="cx"> void deleteAllEntries();
</span><span class="cx">
</span><span class="cx"> using API::Object::ref;
</span><span class="cx"> using API::Object::deref;
</span><span class="cx">
</span><ins>+ static String originKey();
+ static String creationTimeKey();
+ static String modificationTimeKey();
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit WebKeyValueStorageManager(WebContext*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (163211 => 163212)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1366,6 +1366,7 @@
</span><span class="cx"> E133FD8A1423DD7F00FC7BFB /* WebKit.icns in Resources */ = {isa = PBXBuildFile; fileRef = E133FD891423DD7F00FC7BFB /* WebKit.icns */; };
</span><span class="cx"> E134F01712EA5D33004EC58D /* WKPrintingView.h in Headers */ = {isa = PBXBuildFile; fileRef = E134F01512EA5D11004EC58D /* WKPrintingView.h */; };
</span><span class="cx"> E134F01A12EA5D99004EC58D /* WKPrintingView.mm in Sources */ = {isa = PBXBuildFile; fileRef = E134F01912EA5D99004EC58D /* WKPrintingView.mm */; };
</span><ins>+ E13833EC189C33C8001E2350 /* LocalStorageDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = E13833EB189C33C8001E2350 /* LocalStorageDetails.h */; };
</ins><span class="cx"> E14A954916E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */; };
</span><span class="cx"> E14A954A16E016A40068DE82 /* NetworkProcessPlatformStrategies.h in Headers */ = {isa = PBXBuildFile; fileRef = E14A954816E016A40068DE82 /* NetworkProcessPlatformStrategies.h */; };
</span><span class="cx"> E1513C66166EABB200149FCB /* ChildProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1513C64166EABB200149FCB /* ChildProcessProxy.cpp */; };
</span><span class="lines">@@ -3121,6 +3122,7 @@
</span><span class="cx"> E133FD891423DD7F00FC7BFB /* WebKit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = WebKit.icns; path = Resources/WebKit.icns; sourceTree = "<group>"; };
</span><span class="cx"> E134F01512EA5D11004EC58D /* WKPrintingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPrintingView.h; sourceTree = "<group>"; };
</span><span class="cx"> E134F01912EA5D99004EC58D /* WKPrintingView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKPrintingView.mm; sourceTree = "<group>"; };
</span><ins>+ E13833EB189C33C8001E2350 /* LocalStorageDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageDetails.h; sourceTree = "<group>"; };
</ins><span class="cx"> E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessPlatformStrategies.cpp; path = NetworkProcess/NetworkProcessPlatformStrategies.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E14A954816E016A40068DE82 /* NetworkProcessPlatformStrategies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessPlatformStrategies.h; path = NetworkProcess/NetworkProcessPlatformStrategies.h; sourceTree = "<group>"; };
</span><span class="cx"> E1513C64166EABB200149FCB /* ChildProcessProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChildProcessProxy.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4935,6 +4937,7 @@
</span><span class="cx"> BC06F43912DBCCFB002D78DE /* GeolocationPermissionRequestProxy.cpp */,
</span><span class="cx"> BC06F43812DBCCFB002D78DE /* GeolocationPermissionRequestProxy.h */,
</span><span class="cx"> BC6EDAA5111271C600E7678B /* PageClient.h */,
</span><ins>+ E13833EB189C33C8001E2350 /* LocalStorageDetails.h */,
</ins><span class="cx"> 1AC75379183A9FDA0072CB15 /* PageLoadState.cpp */,
</span><span class="cx"> 1AC7537A183A9FDB0072CB15 /* PageLoadState.h */,
</span><span class="cx"> BC597074116591D000551FCA /* ProcessModel.h */,
</span><span class="lines">@@ -6745,6 +6748,7 @@
</span><span class="cx"> 518ACAEA12AEE6BB00B04B83 /* WKProtectionSpaceTypes.h in Headers */,
</span><span class="cx"> 37948409150C4B9700E52CE9 /* WKRenderLayer.h in Headers */,
</span><span class="cx"> 37608823150414F700FC82C7 /* WKRenderObject.h in Headers */,
</span><ins>+ E13833EC189C33C8001E2350 /* LocalStorageDetails.h in Headers */,
</ins><span class="cx"> 3336763B130C99DC006C9DE2 /* WKResourceCacheManager.h in Headers */,
</span><span class="cx"> BC8A501511765F5600757573 /* WKRetainPtr.h in Headers */,
</span><span class="cx"> F634445D12A885E9000612D8 /* WKSecurityOrigin.h in Headers */,
</span></span></pre>
</div>
</div>
</body>
</html>