Diff
Modified: trunk/Source/WebCore/ChangeLog (177152 => 177153)
--- 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)
@@ -1,3 +1,21 @@
+2014-12-11 Anders Carlsson <[email protected]>
+
+ 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:
+
2014-12-11 Alexey Proskuryakov <[email protected]>
REGRESSION (Async Text Input): Text input method state is not reset when reloading a page
Modified: trunk/Source/WebCore/storage/StorageAreaImpl.cpp (177152 => 177153)
--- 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)
@@ -26,13 +26,8 @@
#include "config.h"
#include "StorageAreaImpl.h"
-#include "Document.h"
-#include "ExceptionCode.h"
#include "Frame.h"
-#include "Page.h"
-#include "SchemeRegistry.h"
#include "SecurityOrigin.h"
-#include "Settings.h"
#include "StorageAreaSync.h"
#include "StorageEventDispatcher.h"
#include "StorageMap.h"
Modified: trunk/Source/WebCore/storage/StorageAreaSync.cpp (177152 => 177153)
--- 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)
@@ -26,20 +26,16 @@
#include "config.h"
#include "StorageAreaSync.h"
-#include "EventNames.h"
#include "FileSystem.h"
-#include "HTMLElement.h"
#include "SQLiteDatabaseTracker.h"
#include "SQLiteFileSystem.h"
#include "SQLiteStatement.h"
#include "SQLiteTransaction.h"
-#include "SecurityOrigin.h"
#include "StorageAreaImpl.h"
#include "StorageSyncManager.h"
#include "StorageTracker.h"
#include "SuddenTermination.h"
#include <wtf/MainThread.h>
-#include <wtf/text/CString.h>
namespace WebCore {
Modified: trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp (177152 => 177153)
--- 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)
@@ -26,11 +26,7 @@
#include "config.h"
#include "StorageNamespaceImpl.h"
-#include "GroupSettings.h"
-#include "Page.h"
-#include "PageGroup.h"
#include "SecurityOriginHash.h"
-#include "Settings.h"
#include "StorageAreaImpl.h"
#include "StorageMap.h"
#include "StorageSyncManager.h"
@@ -67,32 +63,6 @@
return storageNamespace;
}
-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());
-}
-
StorageNamespaceImpl::StorageNamespaceImpl(StorageType storageType, const String& path, unsigned quota)
: m_storageType(storageType)
, m_path(path.isolatedCopy())
Modified: trunk/Source/WebCore/storage/StorageNamespaceImpl.h (177152 => 177153)
--- 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)
@@ -56,11 +56,6 @@
virtual void sync() override;
virtual void closeIdleLocalStorageDatabases() override;
- // 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*);
-
private:
StorageNamespaceImpl(StorageType, const String& path, unsigned quota);
Modified: trunk/Source/WebCore/storage/StorageSyncManager.cpp (177152 => 177153)
--- 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)
@@ -26,16 +26,9 @@
#include "config.h"
#include "StorageSyncManager.h"
-#include "EventNames.h"
#include "FileSystem.h"
-#include "Frame.h"
-#include "FrameTree.h"
#include "StorageThread.h"
-#include "Page.h"
-#include "PageGroup.h"
-#include "StorageAreaSync.h"
#include <wtf/MainThread.h>
-#include <wtf/StdLibExtras.h>
#include <wtf/text/CString.h>
namespace WebCore {
Modified: trunk/Source/WebCore/storage/StorageThread.cpp (177152 => 177153)
--- 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)
@@ -26,9 +26,7 @@
#include "config.h"
#include "StorageThread.h"
-#include "StorageAreaSync.h"
#include <wtf/AutodrainedPool.h>
-#include <wtf/HashSet.h>
#include <wtf/MainThread.h>
namespace WebCore {
Modified: trunk/Source/WebCore/storage/StorageTracker.cpp (177152 => 177153)
--- 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)
@@ -26,9 +26,7 @@
#include "config.h"
#include "StorageTracker.h"
-#include "DatabaseThread.h"
#include "FileSystem.h"
-#include "Logging.h"
#include "PageGroup.h"
#include "SQLiteDatabaseTracker.h"
#include "SQLiteFileSystem.h"
