<!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>[177815] 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/177815">177815</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-29 13:32:38 -0800 (Mon, 29 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unneeded StorageNamespace functions
https://bugs.webkit.org/show_bug.cgi?id=139997
Reviewed by Sam Weinig.
Source/WebCore:
* loader/EmptyClients.cpp:
* storage/StorageNamespace.h:
(WebCore::StorageNamespace::closeIdleLocalStorageDatabases): Deleted.
Source/WebKit:
We can just cast to StorageNamespaceImpl directly, no need for virtual dispatch.
* Storage/StorageNamespaceImpl.h:
* Storage/WebStorageNamespaceProvider.cpp:
(WebStorageNamespaceProvider::closeLocalStorage):
(WebStorageNamespaceProvider::clearLocalStorageForAllOrigins):
(WebStorageNamespaceProvider::clearLocalStorageForOrigin):
(WebStorageNamespaceProvider::closeIdleLocalStorageDatabases):
(WebStorageNamespaceProvider::syncLocalStorage):
Source/WebKit2:
* WebProcess/Storage/StorageNamespaceImpl.cpp:
(WebKit::StorageNamespaceImpl::close): Deleted.
(WebKit::StorageNamespaceImpl::clearOriginForDeletion): Deleted.
(WebKit::StorageNamespaceImpl::clearAllOriginsForDeletion): Deleted.
(WebKit::StorageNamespaceImpl::sync): Deleted.
(WebKit::StorageNamespaceImpl::closeIdleLocalStorageDatabases): Deleted.
* WebProcess/Storage/StorageNamespaceImpl.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientscpp">trunk/Source/WebCore/loader/EmptyClients.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageNamespaceh">trunk/Source/WebCore/storage/StorageNamespace.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitStorageStorageNamespaceImplh">trunk/Source/WebKit/Storage/StorageNamespaceImpl.h</a></li>
<li><a href="#trunkSourceWebKitStorageWebStorageNamespaceProvidercpp">trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessStorageStorageNamespaceImplcpp">trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessStorageStorageNamespaceImplh">trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177814 => 177815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-29 21:26:14 UTC (rev 177814)
+++ trunk/Source/WebCore/ChangeLog 2014-12-29 21:32:38 UTC (rev 177815)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-12-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove unneeded StorageNamespace functions
+ https://bugs.webkit.org/show_bug.cgi?id=139997
+
+ Reviewed by Sam Weinig.
+
+ * loader/EmptyClients.cpp:
+ * storage/StorageNamespace.h:
+ (WebCore::StorageNamespace::closeIdleLocalStorageDatabases): Deleted.
+
+2014-12-29 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Get rid of some PageGroup storage functions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139996
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (177814 => 177815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.cpp 2014-12-29 21:26:14 UTC (rev 177814)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2014-12-29 21:32:38 UTC (rev 177815)
</span><span class="lines">@@ -64,11 +64,6 @@
</span><span class="cx"> struct EmptyStorageNamespace final : public StorageNamespace {
</span><span class="cx"> virtual PassRefPtr<StorageArea> storageArea(PassRefPtr<SecurityOrigin>) override { return adoptRef(new EmptyStorageArea); }
</span><span class="cx"> virtual PassRefPtr<StorageNamespace> copy(Page*) override { return adoptRef(new EmptyStorageNamespace); }
</span><del>- virtual void close() override { }
- virtual void clearOriginForDeletion(SecurityOrigin*) override { }
- virtual void clearAllOriginsForDeletion() override { }
- virtual void sync() override { }
- virtual void closeIdleLocalStorageDatabases() override { }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> virtual RefPtr<StorageNamespace> createSessionStorageNamespace(Page&, unsigned) override
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageNamespaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageNamespace.h (177814 => 177815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageNamespace.h 2014-12-29 21:26:14 UTC (rev 177814)
+++ trunk/Source/WebCore/storage/StorageNamespace.h 2014-12-29 21:32:38 UTC (rev 177815)
</span><span class="lines">@@ -42,11 +42,6 @@
</span><span class="cx"> virtual ~StorageNamespace() { }
</span><span class="cx"> virtual PassRefPtr<StorageArea> storageArea(PassRefPtr<SecurityOrigin>) = 0;
</span><span class="cx"> virtual PassRefPtr<StorageNamespace> copy(Page* newPage) = 0;
</span><del>- virtual void close() = 0;
- virtual void clearOriginForDeletion(SecurityOrigin*) = 0;
- virtual void clearAllOriginsForDeletion() = 0;
- virtual void sync() = 0;
- virtual void closeIdleLocalStorageDatabases() { }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (177814 => 177815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-12-29 21:26:14 UTC (rev 177814)
+++ trunk/Source/WebKit/ChangeLog 2014-12-29 21:32:38 UTC (rev 177815)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-12-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove unneeded StorageNamespace functions
+ https://bugs.webkit.org/show_bug.cgi?id=139997
+
+ Reviewed by Sam Weinig.
+
+ We can just cast to StorageNamespaceImpl directly, no need for virtual dispatch.
+
+ * Storage/StorageNamespaceImpl.h:
+ * Storage/WebStorageNamespaceProvider.cpp:
+ (WebStorageNamespaceProvider::closeLocalStorage):
+ (WebStorageNamespaceProvider::clearLocalStorageForAllOrigins):
+ (WebStorageNamespaceProvider::clearLocalStorageForOrigin):
+ (WebStorageNamespaceProvider::closeIdleLocalStorageDatabases):
+ (WebStorageNamespaceProvider::syncLocalStorage):
+
+2014-12-29 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Get rid of some PageGroup storage functions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139996
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageNamespaceImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageNamespaceImpl.h (177814 => 177815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageNamespaceImpl.h 2014-12-29 21:26:14 UTC (rev 177814)
+++ trunk/Source/WebKit/Storage/StorageNamespaceImpl.h 2014-12-29 21:32:38 UTC (rev 177815)
</span><span class="lines">@@ -43,22 +43,23 @@
</span><span class="cx"> WEBCORE_EXPORT static RefPtr<StorageNamespaceImpl> getOrCreateLocalStorageNamespace(const String& databasePath, unsigned quota);
</span><span class="cx"> virtual ~StorageNamespaceImpl();
</span><span class="cx">
</span><del>- virtual PassRefPtr<StorageArea> storageArea(PassRefPtr<SecurityOrigin>) override;
- virtual PassRefPtr<StorageNamespace> copy(Page* newPage) override;
- virtual void close() override;
</del><ins>+ void close();
</ins><span class="cx">
</span><span class="cx"> // Not removing the origin's StorageArea from m_storageAreaMap because
</span><span class="cx"> // we're just deleting the underlying db file. If an item is added immediately
</span><span class="cx"> // after file deletion, we want the same StorageArea to eventually trigger
</span><span class="cx"> // a sync and for StorageAreaSync to recreate the backing db file.
</span><del>- virtual void clearOriginForDeletion(SecurityOrigin*) override;
- virtual void clearAllOriginsForDeletion() override;
- virtual void sync() override;
- virtual void closeIdleLocalStorageDatabases() override;
</del><ins>+ void clearOriginForDeletion(SecurityOrigin*);
+ void clearAllOriginsForDeletion();
+ void sync();
+ void closeIdleLocalStorageDatabases();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> StorageNamespaceImpl(StorageType, const String& path, unsigned quota);
</span><span class="cx">
</span><ins>+ virtual PassRefPtr<StorageArea> storageArea(PassRefPtr<SecurityOrigin>) override;
+ virtual PassRefPtr<StorageNamespace> copy(Page* newPage) override;
+
</ins><span class="cx"> typedef HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageAreaImpl>> StorageAreaMap;
</span><span class="cx"> StorageAreaMap m_storageAreaMap;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitStorageWebStorageNamespaceProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp (177814 => 177815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp 2014-12-29 21:26:14 UTC (rev 177814)
+++ trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp 2014-12-29 21:32:38 UTC (rev 177815)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (const auto& storageNamespaceProvider : storageNamespaceProviders()) {
</span><span class="cx"> if (auto* localStorageNamespace = storageNamespaceProvider->optionalLocalStorageNamespace())
</span><del>- localStorageNamespace->close();
</del><ins>+ static_cast<StorageNamespaceImpl*>(localStorageNamespace)->close();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (const auto& storageNamespaceProvider : storageNamespaceProviders()) {
</span><span class="cx"> if (auto* localStorageNamespace = storageNamespaceProvider->optionalLocalStorageNamespace())
</span><del>- localStorageNamespace->clearAllOriginsForDeletion();
</del><ins>+ static_cast<StorageNamespaceImpl*>(localStorageNamespace)->clearAllOriginsForDeletion();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (const auto& storageNamespaceProvider : storageNamespaceProviders()) {
</span><span class="cx"> if (auto* localStorageNamespace = storageNamespaceProvider->optionalLocalStorageNamespace())
</span><del>- localStorageNamespace->clearOriginForDeletion(origin);
</del><ins>+ static_cast<StorageNamespaceImpl*>(localStorageNamespace)->clearOriginForDeletion(origin);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (const auto& storageNamespaceProvider : storageNamespaceProviders()) {
</span><span class="cx"> if (auto* localStorageNamespace = storageNamespaceProvider->optionalLocalStorageNamespace())
</span><del>- localStorageNamespace->closeIdleLocalStorageDatabases();
</del><ins>+ static_cast<StorageNamespaceImpl*>(localStorageNamespace)->closeIdleLocalStorageDatabases();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (const auto& storageNamespaceProvider : storageNamespaceProviders()) {
</span><span class="cx"> if (auto* localStorageNamespace = storageNamespaceProvider->optionalLocalStorageNamespace())
</span><del>- localStorageNamespace->sync();
</del><ins>+ static_cast<StorageNamespaceImpl*>(localStorageNamespace)->sync();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177814 => 177815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-29 21:26:14 UTC (rev 177814)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-29 21:32:38 UTC (rev 177815)
</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>+ Remove unneeded StorageNamespace functions
+ https://bugs.webkit.org/show_bug.cgi?id=139997
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/Storage/StorageNamespaceImpl.cpp:
+ (WebKit::StorageNamespaceImpl::close): Deleted.
+ (WebKit::StorageNamespaceImpl::clearOriginForDeletion): Deleted.
+ (WebKit::StorageNamespaceImpl::clearAllOriginsForDeletion): Deleted.
+ (WebKit::StorageNamespaceImpl::sync): Deleted.
+ (WebKit::StorageNamespaceImpl::closeIdleLocalStorageDatabases): Deleted.
+ * WebProcess/Storage/StorageNamespaceImpl.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="trunkSourceWebKit2WebProcessStorageStorageNamespaceImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp (177814 => 177815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp 2014-12-29 21:26:14 UTC (rev 177814)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp 2014-12-29 21:32:38 UTC (rev 177815)
</span><span class="lines">@@ -84,34 +84,4 @@
</span><span class="cx"> return createSessionStorageNamespace(WebPage::fromCorePage(newPage)->pageID(), m_quotaInBytes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageNamespaceImpl::close()
-{
- // FIXME: Implement this.
- ASSERT_NOT_REACHED();
-}
-
-void StorageNamespaceImpl::clearOriginForDeletion(SecurityOrigin*)
-{
- // FIXME: Implement this.
- ASSERT_NOT_REACHED();
-}
-
-void StorageNamespaceImpl::clearAllOriginsForDeletion()
-{
- // FIXME: Implement this.
- ASSERT_NOT_REACHED();
-}
-
-void StorageNamespaceImpl::sync()
-{
- // FIXME: Implement this.
- ASSERT_NOT_REACHED();
-}
-
-void StorageNamespaceImpl::closeIdleLocalStorageDatabases()
-{
- // FIXME: Implement this.
- ASSERT_NOT_REACHED();
-}
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessStorageStorageNamespaceImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h (177814 => 177815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h 2014-12-29 21:26:14 UTC (rev 177814)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h 2014-12-29 21:32:38 UTC (rev 177815)
</span><span class="lines">@@ -54,11 +54,6 @@
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<WebCore::StorageArea> storageArea(PassRefPtr<WebCore::SecurityOrigin>) override;
</span><span class="cx"> virtual PassRefPtr<WebCore::StorageNamespace> copy(WebCore::Page*) override;
</span><del>- virtual void close() override;
- virtual void clearOriginForDeletion(WebCore::SecurityOrigin*) override;
- virtual void clearAllOriginsForDeletion() override;
- virtual void sync() override;
- virtual void closeIdleLocalStorageDatabases() override;
</del><span class="cx">
</span><span class="cx"> const WebCore::StorageType m_storageType;
</span><span class="cx"> const uint64_t m_storageNamespaceID;
</span></span></pre>
</div>
</div>
</body>
</html>