<!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>[177153] trunk/Source/WebCore</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/177153">177153</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-11 09:37:12 -0800 (Thu, 11 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused storage header includes
https://bugs.webkit.org/show_bug.cgi?id=139540
Reviewed by Antti Koivisto.
* storage/StorageAreaImpl.cpp:
* storage/StorageAreaSync.cpp:
* storage/StorageNamespaceImpl.cpp:
(WebCore::StorageNamespaceImpl::localStorageNamespace): Deleted.
(WebCore::StorageNamespaceImpl::sessionStorageNamespace): Deleted.
(WebCore::StorageNamespaceImpl::transientLocalStorageNamespace): Deleted.
* storage/StorageNamespaceImpl.h:
* storage/StorageSyncManager.cpp:
* storage/StorageThread.cpp:
* storage/StorageTracker.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorestorageStorageAreaImplcpp">trunk/Source/WebCore/storage/StorageAreaImpl.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageAreaSynccpp">trunk/Source/WebCore/storage/StorageAreaSync.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageNamespaceImplcpp">trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageNamespaceImplh">trunk/Source/WebCore/storage/StorageNamespaceImpl.h</a></li>
<li><a href="#trunkSourceWebCorestorageStorageSyncManagercpp">trunk/Source/WebCore/storage/StorageSyncManager.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageThreadcpp">trunk/Source/WebCore/storage/StorageThread.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageTrackercpp">trunk/Source/WebCore/storage/StorageTracker.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177152 => 177153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-11 17:23:34 UTC (rev 177152)
+++ trunk/Source/WebCore/ChangeLog 2014-12-11 17:37:12 UTC (rev 177153)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-12-11 Anders Carlsson <andersca@apple.com>
+
+ Remove unused storage header includes
+ https://bugs.webkit.org/show_bug.cgi?id=139540
+
+ Reviewed by Antti Koivisto.
+
+ * storage/StorageAreaImpl.cpp:
+ * storage/StorageAreaSync.cpp:
+ * storage/StorageNamespaceImpl.cpp:
+ (WebCore::StorageNamespaceImpl::localStorageNamespace): Deleted.
+ (WebCore::StorageNamespaceImpl::sessionStorageNamespace): Deleted.
+ (WebCore::StorageNamespaceImpl::transientLocalStorageNamespace): Deleted.
+ * storage/StorageNamespaceImpl.h:
+ * storage/StorageSyncManager.cpp:
+ * storage/StorageThread.cpp:
+ * storage/StorageTracker.cpp:
+
</ins><span class="cx"> 2014-12-11 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (Async Text Input): Text input method state is not reset when reloading a page
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageAreaImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageAreaImpl.cpp (177152 => 177153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageAreaImpl.cpp 2014-12-11 17:23:34 UTC (rev 177152)
+++ trunk/Source/WebCore/storage/StorageAreaImpl.cpp 2014-12-11 17:37:12 UTC (rev 177153)
</span><span class="lines">@@ -26,13 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "StorageAreaImpl.h"
</span><span class="cx">
</span><del>-#include "Document.h"
-#include "ExceptionCode.h"
</del><span class="cx"> #include "Frame.h"
</span><del>-#include "Page.h"
-#include "SchemeRegistry.h"
</del><span class="cx"> #include "SecurityOrigin.h"
</span><del>-#include "Settings.h"
</del><span class="cx"> #include "StorageAreaSync.h"
</span><span class="cx"> #include "StorageEventDispatcher.h"
</span><span class="cx"> #include "StorageMap.h"
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageAreaSynccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageAreaSync.cpp (177152 => 177153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageAreaSync.cpp 2014-12-11 17:23:34 UTC (rev 177152)
+++ trunk/Source/WebCore/storage/StorageAreaSync.cpp 2014-12-11 17:37:12 UTC (rev 177153)
</span><span class="lines">@@ -26,20 +26,16 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "StorageAreaSync.h"
</span><span class="cx">
</span><del>-#include "EventNames.h"
</del><span class="cx"> #include "FileSystem.h"
</span><del>-#include "HTMLElement.h"
</del><span class="cx"> #include "SQLiteDatabaseTracker.h"
</span><span class="cx"> #include "SQLiteFileSystem.h"
</span><span class="cx"> #include "SQLiteStatement.h"
</span><span class="cx"> #include "SQLiteTransaction.h"
</span><del>-#include "SecurityOrigin.h"
</del><span class="cx"> #include "StorageAreaImpl.h"
</span><span class="cx"> #include "StorageSyncManager.h"
</span><span class="cx"> #include "StorageTracker.h"
</span><span class="cx"> #include "SuddenTermination.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><del>-#include <wtf/text/CString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageNamespaceImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp (177152 => 177153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp 2014-12-11 17:23:34 UTC (rev 177152)
+++ trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp 2014-12-11 17:37:12 UTC (rev 177153)
</span><span class="lines">@@ -26,11 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "StorageNamespaceImpl.h"
</span><span class="cx">
</span><del>-#include "GroupSettings.h"
-#include "Page.h"
-#include "PageGroup.h"
</del><span class="cx"> #include "SecurityOriginHash.h"
</span><del>-#include "Settings.h"
</del><span class="cx"> #include "StorageAreaImpl.h"
</span><span class="cx"> #include "StorageMap.h"
</span><span class="cx"> #include "StorageSyncManager.h"
</span><span class="lines">@@ -67,32 +63,6 @@
</span><span class="cx"> return storageNamespace;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<StorageNamespace> StorageNamespaceImpl::localStorageNamespace(PageGroup* pageGroup)
-{
- // Need a page in this page group to query the settings for the local storage database path.
- // Having these parameters attached to the page settings is unfortunate since these settings are
- // not per-page (and, in fact, we simply grab the settings from some page at random), but
- // at this point we're stuck with it.
- Page* page = *pageGroup->pages().begin();
- const String& path = page->settings().localStorageDatabasePath();
- unsigned quota = pageGroup->groupSettings().localStorageQuotaBytes();
- const String lookupPath = path.isNull() ? emptyString() : path;
-
- return getOrCreateLocalStorageNamespace(path.isNull() ? emptyString() : path, quota);
-}
-
-PassRefPtr<StorageNamespace> StorageNamespaceImpl::sessionStorageNamespace(Page* page)
-{
- return createSessionStorageNamespace(page->settings().sessionStorageQuota());
-}
-
-PassRefPtr<StorageNamespace> StorageNamespaceImpl::transientLocalStorageNamespace(PageGroup* pageGroup, SecurityOrigin*)
-{
- // FIXME: A smarter implementation would create a special namespace type instead of just piggy-backing off
- // SessionStorageNamespace here.
- return StorageNamespaceImpl::sessionStorageNamespace(*pageGroup->pages().begin());
-}
-
</del><span class="cx"> StorageNamespaceImpl::StorageNamespaceImpl(StorageType storageType, const String& path, unsigned quota)
</span><span class="cx"> : m_storageType(storageType)
</span><span class="cx"> , m_path(path.isolatedCopy())
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageNamespaceImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageNamespaceImpl.h (177152 => 177153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageNamespaceImpl.h 2014-12-11 17:23:34 UTC (rev 177152)
+++ trunk/Source/WebCore/storage/StorageNamespaceImpl.h 2014-12-11 17:37:12 UTC (rev 177153)
</span><span class="lines">@@ -56,11 +56,6 @@
</span><span class="cx"> virtual void sync() override;
</span><span class="cx"> virtual void closeIdleLocalStorageDatabases() override;
</span><span class="cx">
</span><del>- // FIXME: These are all deprecated and should not be called by anyone.
- static PassRefPtr<StorageNamespace> localStorageNamespace(PageGroup*);
- static PassRefPtr<StorageNamespace> transientLocalStorageNamespace(PageGroup*, SecurityOrigin*);
- static PassRefPtr<StorageNamespace> sessionStorageNamespace(Page*);
-
</del><span class="cx"> private:
</span><span class="cx"> StorageNamespaceImpl(StorageType, const String& path, unsigned quota);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageSyncManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageSyncManager.cpp (177152 => 177153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageSyncManager.cpp 2014-12-11 17:23:34 UTC (rev 177152)
+++ trunk/Source/WebCore/storage/StorageSyncManager.cpp 2014-12-11 17:37:12 UTC (rev 177153)
</span><span class="lines">@@ -26,16 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "StorageSyncManager.h"
</span><span class="cx">
</span><del>-#include "EventNames.h"
</del><span class="cx"> #include "FileSystem.h"
</span><del>-#include "Frame.h"
-#include "FrameTree.h"
</del><span class="cx"> #include "StorageThread.h"
</span><del>-#include "Page.h"
-#include "PageGroup.h"
-#include "StorageAreaSync.h"
</del><span class="cx"> #include <wtf/MainThread.h>
</span><del>-#include <wtf/StdLibExtras.h>
</del><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageThread.cpp (177152 => 177153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageThread.cpp 2014-12-11 17:23:34 UTC (rev 177152)
+++ trunk/Source/WebCore/storage/StorageThread.cpp 2014-12-11 17:37:12 UTC (rev 177153)
</span><span class="lines">@@ -26,9 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "StorageThread.h"
</span><span class="cx">
</span><del>-#include "StorageAreaSync.h"
</del><span class="cx"> #include <wtf/AutodrainedPool.h>
</span><del>-#include <wtf/HashSet.h>
</del><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageTracker.cpp (177152 => 177153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageTracker.cpp 2014-12-11 17:23:34 UTC (rev 177152)
+++ trunk/Source/WebCore/storage/StorageTracker.cpp 2014-12-11 17:37:12 UTC (rev 177153)
</span><span class="lines">@@ -26,9 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "StorageTracker.h"
</span><span class="cx">
</span><del>-#include "DatabaseThread.h"
</del><span class="cx"> #include "FileSystem.h"
</span><del>-#include "Logging.h"
</del><span class="cx"> #include "PageGroup.h"
</span><span class="cx"> #include "SQLiteDatabaseTracker.h"
</span><span class="cx"> #include "SQLiteFileSystem.h"
</span></span></pre>
</div>
</div>
</body>
</html>