<!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>[177814] 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/177814">177814</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-29 13:26:14 -0800 (Mon, 29 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of some PageGroup storage functions
https://bugs.webkit.org/show_bug.cgi?id=139996
Reviewed by Sam Weinig.
Source/WebCore:
* WebCore.exp.in:
* page/PageGroup.cpp:
(WebCore::PageGroup::closeLocalStorage): Deleted.
(WebCore::PageGroup::clearLocalStorageForAllOrigins): Deleted.
(WebCore::PageGroup::clearLocalStorageForOrigin): Deleted.
(WebCore::PageGroup::closeIdleLocalStorageDatabases): Deleted.
(WebCore::PageGroup::syncLocalStorage): Deleted.
* page/PageGroup.h:
Source/WebKit:
Call WebStorageNamespaceProvider directly instead.
* Storage/StorageTracker.cpp:
(WebCore::StorageTracker::deleteAllOrigins):
(WebCore::StorageTracker::deleteOrigin):
Source/WebKit/mac:
Call WebStorageNamespaceProvider directly instead.
* Storage/WebStorageManager.mm:
(-[WebStorageManager syncLocalStorage]):
(+[WebStorageManager closeIdleLocalStorageDatabases]):
* WebView/WebView.mm:
(+[WebView _applicationWillTerminate]):</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="#trunkSourceWebCorepagePageGroupcpp">trunk/Source/WebCore/page/PageGroup.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageGrouph">trunk/Source/WebCore/page/PageGroup.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitStorageStorageTrackercpp">trunk/Source/WebKit/Storage/StorageTracker.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebStorageManagermm">trunk/Source/WebKit/mac/Storage/WebStorageManager.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177813 => 177814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-29 21:12:28 UTC (rev 177813)
+++ trunk/Source/WebCore/ChangeLog 2014-12-29 21:26:14 UTC (rev 177814)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-12-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Get rid of some PageGroup storage functions
+ https://bugs.webkit.org/show_bug.cgi?id=139996
+
+ Reviewed by Sam Weinig.
+
+ * WebCore.exp.in:
+ * page/PageGroup.cpp:
+ (WebCore::PageGroup::closeLocalStorage): Deleted.
+ (WebCore::PageGroup::clearLocalStorageForAllOrigins): Deleted.
+ (WebCore::PageGroup::clearLocalStorageForOrigin): Deleted.
+ (WebCore::PageGroup::closeIdleLocalStorageDatabases): Deleted.
+ (WebCore::PageGroup::syncLocalStorage): Deleted.
+ * page/PageGroup.h:
+
+2014-12-29 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Move storage code from WebCore to WebKit
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139558
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (177813 => 177814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-12-29 21:12:28 UTC (rev 177813)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-12-29 21:26:14 UTC (rev 177814)
</span><span class="lines">@@ -1558,11 +1558,6 @@
</span><span class="cx"> __ZN7WebCore9PageCache18pruneToCapacityNowEiNS_13PruningReasonE
</span><span class="cx"> __ZN7WebCore9PageCache33markPagesForVistedLinkStyleRecalcEv
</span><span class="cx"> __ZN7WebCore9PageCache6removeEPNS_11HistoryItemE
</span><del>-__ZN7WebCore9PageGroup16syncLocalStorageEv
-__ZN7WebCore9PageGroup17closeLocalStorageEv
-__ZN7WebCore9PageGroup26clearLocalStorageForOriginEPNS_14SecurityOriginE
-__ZN7WebCore9PageGroup30clearLocalStorageForAllOriginsEv
-__ZN7WebCore9PageGroup30closeIdleLocalStorageDatabasesEv
</del><span class="cx"> __ZN7WebCore9PageGroup9pageGroupERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore9Scrollbar11mouseExitedEv
</span><span class="cx"> __ZN7WebCore9Scrollbar12mouseEnteredEv
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.cpp (177813 => 177814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.cpp 2014-12-29 21:12:28 UTC (rev 177813)
+++ trunk/Source/WebCore/page/PageGroup.cpp 2014-12-29 21:26:14 UTC (rev 177814)
</span><span class="lines">@@ -97,61 +97,6 @@
</span><span class="cx"> return result.iterator->value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageGroup::closeLocalStorage()
-{
- if (!pageGroups)
- return;
-
- for (auto it = pageGroups->begin(), end = pageGroups->end(); it != end; ++it) {
- if (it->value->hasLocalStorage())
- it->value->localStorage()->close();
- }
-}
-
-void PageGroup::clearLocalStorageForAllOrigins()
-{
- if (!pageGroups)
- return;
-
- for (auto it = pageGroups->begin(), end = pageGroups->end(); it != end; ++it) {
- if (it->value->hasLocalStorage())
- it->value->localStorage()->clearAllOriginsForDeletion();
- }
-}
-
-void PageGroup::clearLocalStorageForOrigin(SecurityOrigin* origin)
-{
- if (!pageGroups)
- return;
-
- for (auto it = pageGroups->begin(), end = pageGroups->end(); it != end; ++it) {
- if (it->value->hasLocalStorage())
- it->value->localStorage()->clearOriginForDeletion(origin);
- }
-}
-
-void PageGroup::closeIdleLocalStorageDatabases()
-{
- if (!pageGroups)
- return;
-
- for (auto it = pageGroups->begin(), end = pageGroups->end(); it != end; ++it) {
- if (it->value->hasLocalStorage())
- it->value->localStorage()->closeIdleLocalStorageDatabases();
- }
-}
-
-void PageGroup::syncLocalStorage()
-{
- if (!pageGroups)
- return;
-
- for (auto it = pageGroups->begin(), end = pageGroups->end(); it != end; ++it) {
- if (it->value->hasLocalStorage())
- it->value->localStorage()->sync();
- }
-}
-
</del><span class="cx"> void PageGroup::addPage(Page& page)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_pages.contains(&page));
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.h (177813 => 177814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.h 2014-12-29 21:12:28 UTC (rev 177813)
+++ trunk/Source/WebCore/page/PageGroup.h 2014-12-29 21:26:14 UTC (rev 177814)
</span><span class="lines">@@ -56,14 +56,6 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static PageGroup* pageGroup(const String& groupName);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static void closeLocalStorage();
-
- static void clearLocalStorageForAllOrigins();
- static void clearLocalStorageForOrigin(SecurityOrigin*);
- WEBCORE_EXPORT static void closeIdleLocalStorageDatabases();
- // DumpRenderTree helper that triggers a StorageArea sync.
- WEBCORE_EXPORT static void syncLocalStorage();
-
</del><span class="cx"> const HashSet<Page*>& pages() const { return m_pages; }
</span><span class="cx">
</span><span class="cx"> void addPage(Page&);
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (177813 => 177814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-12-29 21:12:28 UTC (rev 177813)
+++ trunk/Source/WebKit/ChangeLog 2014-12-29 21:26:14 UTC (rev 177814)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-12-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Get rid of some PageGroup storage functions
+ https://bugs.webkit.org/show_bug.cgi?id=139996
+
+ Reviewed by Sam Weinig.
+
+ Call WebStorageNamespaceProvider directly instead.
+
+ * Storage/StorageTracker.cpp:
+ (WebCore::StorageTracker::deleteAllOrigins):
+ (WebCore::StorageTracker::deleteOrigin):
+
+2014-12-29 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Move storage code from WebCore to WebKit
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139558
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageTracker.cpp (177813 => 177814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageTracker.cpp 2014-12-29 21:12:28 UTC (rev 177813)
+++ trunk/Source/WebKit/Storage/StorageTracker.cpp 2014-12-29 21:26:14 UTC (rev 177814)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include "StorageThread.h"
</span><span class="cx"> #include "StorageTrackerClient.h"
</span><ins>+#include "WebStorageNamespaceProvider.h"
</ins><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/PageGroup.h>
</span><span class="cx"> #include <WebCore/SQLiteDatabaseTracker.h>
</span><span class="lines">@@ -396,7 +397,7 @@
</span><span class="cx"> m_originSet.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- PageGroup::clearLocalStorageForAllOrigins();
</del><ins>+ WebStorageNamespaceProvider::clearLocalStorageForAllOrigins();
</ins><span class="cx">
</span><span class="cx"> m_thread->dispatch([this] {
</span><span class="cx"> syncDeleteAllOrigins();
</span><span class="lines">@@ -493,7 +494,7 @@
</span><span class="cx"> // to reopen the db before the db is deleted by a StorageTracker thread.
</span><span class="cx"> // In this case, reopening the db in StorageAreaSync will cancel a pending
</span><span class="cx"> // StorageTracker db deletion.
</span><del>- PageGroup::clearLocalStorageForOrigin(origin);
</del><ins>+ WebStorageNamespaceProvider::clearLocalStorageForOrigin(origin);
</ins><span class="cx">
</span><span class="cx"> String originId = origin->databaseIdentifier();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177813 => 177814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-29 21:12:28 UTC (rev 177813)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-29 21:26:14 UTC (rev 177814)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-12-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Get rid of some PageGroup storage functions
+ https://bugs.webkit.org/show_bug.cgi?id=139996
+
+ Reviewed by Sam Weinig.
+
+ Call WebStorageNamespaceProvider directly instead.
+
+ * Storage/WebStorageManager.mm:
+ (-[WebStorageManager syncLocalStorage]):
+ (+[WebStorageManager closeIdleLocalStorageDatabases]):
+ * WebView/WebView.mm:
+ (+[WebView _applicationWillTerminate]):
+
+2014-12-29 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Move storage code from WebCore to WebKit
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139558
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebStorageManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebStorageManager.mm (177813 => 177814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebStorageManager.mm 2014-12-29 21:12:28 UTC (rev 177813)
+++ trunk/Source/WebKit/mac/Storage/WebStorageManager.mm 2014-12-29 21:26:14 UTC (rev 177814)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #import "StorageTracker.h"
</span><span class="cx"> #import "WebSecurityOriginInternal.h"
</span><ins>+#import "WebStorageNamespaceProvider.h"
</ins><span class="cx"> #import "WebStorageTrackerClient.h"
</span><span class="cx"> #import <WebCore/PageGroup.h>
</span><span class="cx"> #import <WebCore/SecurityOrigin.h>
</span><span class="lines">@@ -100,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)syncLocalStorage
</span><span class="cx"> {
</span><del>- PageGroup::syncLocalStorage();
</del><ins>+ WebStorageNamespaceProvider::syncLocalStorage();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)syncFileSystemAndTrackerDatabase
</span><span class="lines">@@ -121,7 +122,7 @@
</span><span class="cx">
</span><span class="cx"> + (void)closeIdleLocalStorageDatabases
</span><span class="cx"> {
</span><del>- PageGroup::closeIdleLocalStorageDatabases();
</del><ins>+ WebStorageNamespaceProvider::closeIdleLocalStorageDatabases();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void initializeLocalStoragePath()
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (177813 => 177814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-29 21:12:28 UTC (rev 177813)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-29 21:26:14 UTC (rev 177814)
</span><span class="lines">@@ -4803,7 +4803,6 @@
</span><span class="cx"> [WebPluginDatabase closeSharedDatabase];
</span><span class="cx">
</span><span class="cx"> WebStorageNamespaceProvider::closeLocalStorage();
</span><del>- PageGroup::closeLocalStorage();
</del><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>