<!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>[185625] 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/185625">185625</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-16 16:30:49 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move LocalStorageDetails into the local storage database tracker
https://bugs.webkit.org/show_bug.cgi?id=146034
Reviewed by Andreas Kling.
* UIProcess/API/C/WKKeyValueStorageManager.cpp:
(WKKeyValueStorageManagerGetStorageDetailsByOrigin):
(WKKeyValueStorageManagerDeleteAllEntries):
* UIProcess/LocalStorageDetails.h: Removed.
* UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
(WebKit::LocalStorageDatabaseTracker::originDetails):
(WebKit::LocalStorageDatabaseTracker::details): Deleted.
* UIProcess/Storage/LocalStorageDatabaseTracker.h:
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::getLocalStorageOriginDetails):
(WebKit::StorageManager::getLocalStorageDetailsByOrigin): Deleted.
(WebKit::StorageManager::deleteAllLocalStorageEntries): Deleted.
* UIProcess/Storage/StorageManager.h:
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<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="#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="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed 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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185624 => 185625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-16 22:56:24 UTC (rev 185624)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-16 23:30:49 UTC (rev 185625)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-06-16 Anders Carlsson <andersca@apple.com>
+
+ Move LocalStorageDetails into the local storage database tracker
+ https://bugs.webkit.org/show_bug.cgi?id=146034
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/API/C/WKKeyValueStorageManager.cpp:
+ (WKKeyValueStorageManagerGetStorageDetailsByOrigin):
+ (WKKeyValueStorageManagerDeleteAllEntries):
+ * UIProcess/LocalStorageDetails.h: Removed.
+ * UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
+ (WebKit::LocalStorageDatabaseTracker::originDetails):
+ (WebKit::LocalStorageDatabaseTracker::details): Deleted.
+ * UIProcess/Storage/LocalStorageDatabaseTracker.h:
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::getLocalStorageOriginDetails):
+ (WebKit::StorageManager::getLocalStorageDetailsByOrigin): Deleted.
+ (WebKit::StorageManager::deleteAllLocalStorageEntries): Deleted.
+ * UIProcess/Storage/StorageManager.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-06-16 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Removed the WebKit2SandboxProfiles target.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp (185624 => 185625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp 2015-06-16 22:56:24 UTC (rev 185624)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp 2015-06-16 23:30:49 UTC (rev 185625)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "APIDictionary.h"
</span><span class="cx"> #include "APIWebsiteDataStore.h"
</span><del>-#include "LocalStorageDetails.h"
</del><span class="cx"> #include "StorageManager.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WebsiteDataStore.h"
</span><span class="lines">@@ -90,12 +89,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- storageManager->getLocalStorageDetailsByOrigin([context, callback](Vector<LocalStorageDetails> storageDetails) {
</del><ins>+ storageManager->getLocalStorageOriginDetails([context, callback](Vector<LocalStorageDatabaseTracker::OriginDetails> storageDetails) {
</ins><span class="cx"> HashMap<String, RefPtr<API::Object>> detailsMap;
</span><span class="cx"> Vector<RefPtr<API::Object>> result;
</span><span class="cx"> result.reserveInitialCapacity(storageDetails.size());
</span><span class="cx">
</span><del>- for (const LocalStorageDetails& originDetails : storageDetails) {
</del><ins>+ for (const auto& originDetails : storageDetails) {
</ins><span class="cx"> HashMap<String, RefPtr<API::Object>> detailsMap;
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Object> origin = API::SecurityOrigin::create(WebCore::SecurityOrigin::createFromDatabaseIdentifier(originDetails.originIdentifier));
</span><span class="lines">@@ -128,5 +127,5 @@
</span><span class="cx"> if (!storageManager)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- storageManager->deleteAllLocalStorageEntries();
</del><ins>+ storageManager->deleteLocalStorageOriginsModifiedSince(std::chrono::system_clock::time_point::min(), [] { });
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLocalStorageDetailsh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h (185624 => 185625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h 2015-06-16 22:56:24 UTC (rev 185624)
+++ trunk/Source/WebKit2/UIProcess/LocalStorageDetails.h 2015-06-16 23:30:49 UTC (rev 185625)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * 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/Optional.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-
-struct LocalStorageDetails {
- String originIdentifier;
- Optional<time_t> creationTime;
- Optional<time_t> modificationTime;
-};
-
-} // namespace WebKit
-
-#endif // LocalStorageDetails_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (185624 => 185625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2015-06-16 22:56:24 UTC (rev 185624)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2015-06-16 23:30:49 UTC (rev 185625)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "LocalStorageDatabaseTracker.h"
</span><span class="cx">
</span><del>-#include "LocalStorageDetails.h"
</del><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/SQLiteStatement.h>
</span><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><span class="lines">@@ -178,15 +177,15 @@
</span><span class="cx"> return origins;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<LocalStorageDetails> LocalStorageDatabaseTracker::details()
</del><ins>+Vector<LocalStorageDatabaseTracker::OriginDetails> LocalStorageDatabaseTracker::originDetails()
</ins><span class="cx"> {
</span><del>- Vector<LocalStorageDetails> result;
</del><ins>+ Vector<OriginDetails> result;
</ins><span class="cx"> result.reserveInitialCapacity(m_origins.size());
</span><span class="cx">
</span><span class="cx"> for (const String& origin : m_origins) {
</span><span class="cx"> String filePath = pathForDatabaseWithOriginIdentifier(origin);
</span><span class="cx">
</span><del>- LocalStorageDetails details;
</del><ins>+ OriginDetails details;
</ins><span class="cx"> details.originIdentifier = origin.isolatedCopy();
</span><span class="cx"> details.creationTime = fileCreationTime(filePath);
</span><span class="cx"> details.modificationTime = fileModificationTime(filePath);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h (185624 => 185625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2015-06-16 22:56:24 UTC (rev 185624)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2015-06-16 23:30:49 UTC (rev 185625)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/SQLiteDatabase.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="lines">@@ -58,8 +59,14 @@
</span><span class="cx"> Vector<Ref<WebCore::SecurityOrigin>> deleteDatabasesModifiedSince(std::chrono::system_clock::time_point);
</span><span class="cx">
</span><span class="cx"> Vector<Ref<WebCore::SecurityOrigin>> origins() const;
</span><del>- Vector<LocalStorageDetails> details();
</del><span class="cx">
</span><ins>+ struct OriginDetails {
+ String originIdentifier;
+ Optional<time_t> creationTime;
+ Optional<time_t> modificationTime;
+ };
+ Vector<OriginDetails> originDetails();
+
</ins><span class="cx"> private:
</span><span class="cx"> LocalStorageDatabaseTracker(PassRefPtr<WorkQueue>, const String& localStorageDirectory);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (185624 => 185625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-06-16 22:56:24 UTC (rev 185624)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-06-16 23:30:49 UTC (rev 185625)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "LocalStorageDatabase.h"
</span><span class="cx"> #include "LocalStorageDatabaseTracker.h"
</span><del>-#include "LocalStorageDetails.h"
</del><span class="cx"> #include "SecurityOriginData.h"
</span><span class="cx"> #include "StorageAreaMapMessages.h"
</span><span class="cx"> #include "StorageManagerMessages.h"
</span><span class="lines">@@ -624,15 +623,15 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::getLocalStorageDetailsByOrigin(std::function<void (Vector<LocalStorageDetails>)> completionHandler)
</del><ins>+void StorageManager::getLocalStorageOriginDetails(std::function<void (Vector<LocalStorageDatabaseTracker::OriginDetails>)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><span class="cx">
</span><span class="cx"> m_queue->dispatch([storageManager, completionHandler] {
</span><del>- auto storageDetails = storageManager->m_localStorageDatabaseTracker->details();
</del><ins>+ auto originDetails = storageManager->m_localStorageDatabaseTracker->originDetails();
</ins><span class="cx">
</span><del>- RunLoop::main().dispatch([storageDetails, completionHandler]() mutable {
- completionHandler(WTF::move(storageDetails));
</del><ins>+ RunLoop::main().dispatch([originDetails, completionHandler]() mutable {
+ completionHandler(WTF::move(originDetails));
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -653,21 +652,6 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::deleteAllLocalStorageEntries()
-{
- RefPtr<StorageManager> storageManager(this);
-
- m_queue->dispatch([storageManager] {
- for (auto& localStorageNamespace : storageManager->m_localStorageNamespaces.values())
- localStorageNamespace->clearAllStorageAreas();
-
- for (auto& transientLocalStorageNamespace : storageManager->m_transientLocalStorageNamespaces.values())
- transientLocalStorageNamespace->clearAllStorageAreas();
-
- storageManager->m_localStorageDatabaseTracker->deleteAllDatabases();
- });
-}
-
</del><span class="cx"> void StorageManager::deleteLocalStorageOriginsModifiedSince(std::chrono::system_clock::time_point time, std::function<void ()> completionHandler)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (185624 => 185625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-06-16 22:56:24 UTC (rev 185624)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-06-16 23:30:49 UTC (rev 185625)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define StorageManager_h
</span><span class="cx">
</span><span class="cx"> #include "Connection.h"
</span><ins>+#include "LocalStorageDatabaseTracker.h"
</ins><span class="cx"> #include <WebCore/SecurityOriginHash.h>
</span><span class="cx"> #include <chrono>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -40,7 +41,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-struct LocalStorageDetails;
</del><span class="cx"> struct SecurityOriginData;
</span><span class="cx"> class LocalStorageDatabaseTracker;
</span><span class="cx"> class WebProcessProxy;
</span><span class="lines">@@ -64,13 +64,13 @@
</span><span class="cx"> void deleteSessionStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&, std::function<void ()> completionHandler);
</span><span class="cx">
</span><span class="cx"> void getLocalStorageOrigins(std::function<void (HashSet<RefPtr<WebCore::SecurityOrigin>>&&)> completionHandler);
</span><del>- void getLocalStorageDetailsByOrigin(std::function<void (Vector<LocalStorageDetails>)> completionHandler);
</del><span class="cx"> void deleteLocalStorageEntriesForOrigin(const WebCore::SecurityOrigin&);
</span><del>- void deleteAllLocalStorageEntries();
</del><span class="cx">
</span><span class="cx"> void deleteLocalStorageOriginsModifiedSince(std::chrono::system_clock::time_point, std::function<void ()> completionHandler);
</span><span class="cx"> void deleteLocalStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&, std::function<void ()> completionHandler);
</span><span class="cx">
</span><ins>+ void getLocalStorageOriginDetails(std::function<void (Vector<LocalStorageDatabaseTracker::OriginDetails>)> completionHandler);
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit StorageManager(const String& localStorageDirectory);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (185624 => 185625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-16 22:56:24 UTC (rev 185624)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-16 23:30:49 UTC (rev 185625)
</span><span class="lines">@@ -1703,7 +1703,6 @@
</span><span class="cx"> E115C716190F8A2500ECC516 /* com.apple.WebKit.Databases.sb in Resources */ = {isa = PBXBuildFile; fileRef = E115C715190F8A2500ECC516 /* com.apple.WebKit.Databases.sb */; };
</span><span class="cx"> E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */; };
</span><span class="cx"> E133FD8A1423DD7F00FC7BFB /* WebKit.icns in Resources */ = {isa = PBXBuildFile; fileRef = E133FD891423DD7F00FC7BFB /* WebKit.icns */; };
</span><del>- E13833EC189C33C8001E2350 /* LocalStorageDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = E13833EB189C33C8001E2350 /* LocalStorageDetails.h */; };
</del><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">@@ -3937,7 +3936,6 @@
</span><span class="cx"> E105FE5318D7B9DE008F57A8 /* EditingRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingRange.h; sourceTree = "<group>"; };
</span><span class="cx"> E115C715190F8A2500ECC516 /* com.apple.WebKit.Databases.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.WebKit.Databases.sb; sourceTree = "<group>"; };
</span><span class="cx"> E133FD891423DD7F00FC7BFB /* WebKit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = WebKit.icns; path = Resources/WebKit.icns; sourceTree = "<group>"; };
</span><del>- E13833EB189C33C8001E2350 /* LocalStorageDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageDetails.h; sourceTree = "<group>"; };
</del><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">@@ -6078,7 +6076,6 @@
</span><span class="cx"> BC06F43912DBCCFB002D78DE /* GeolocationPermissionRequestProxy.cpp */,
</span><span class="cx"> BC06F43812DBCCFB002D78DE /* GeolocationPermissionRequestProxy.h */,
</span><span class="cx"> 31607F3819627002009B87DA /* LegacySessionStateCoding.h */,
</span><del>- E13833EB189C33C8001E2350 /* LocalStorageDetails.h */,
</del><span class="cx"> BC6EDAA5111271C600E7678B /* PageClient.h */,
</span><span class="cx"> 1AC75379183A9FDA0072CB15 /* PageLoadState.cpp */,
</span><span class="cx"> 1AC7537A183A9FDB0072CB15 /* PageLoadState.h */,
</span><span class="lines">@@ -7684,7 +7681,6 @@
</span><span class="cx"> 1A1DC340196346D700FF7059 /* LegacySessionStateCoding.h in Headers */,
</span><span class="cx"> 1A1D8BA21731A36300141DA4 /* LocalStorageDatabase.h in Headers */,
</span><span class="cx"> 1A8C728D1738477C000A6554 /* LocalStorageDatabaseTracker.h in Headers */,
</span><del>- E13833EC189C33C8001E2350 /* LocalStorageDetails.h in Headers */,
</del><span class="cx"> 51A7F2F3125BF820008AEB1D /* Logging.h in Headers */,
</span><span class="cx"> BCC56F791159957D001CCAF9 /* MachPort.h in Headers */,
</span><span class="cx"> 1A24B5F311F531E800C38269 /* MachUtilities.h in Headers */,
</span></span></pre>
</div>
</div>
</body>
</html>