From 619249e9f21f0c116b3898dcb9976a5df09157f3 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Fri, 24 Feb 2012 08:38:46 +0000 Subject: [PATCH] Rename LocalStorageThread to StorageThread and LocalStorageTask to StorageTask. https://bugs.webkit.org/show_bug.cgi?id=79358 Revision 45124 commented FIXME to rename these classes. Patch by Huang Dongsung on 2012-02-24 Reviewed by Kentaro Hara. * CMakeLists.txt: * GNUmakefile.list.am: * Target.pri: * WebCore.gypi: * WebCore.order: * WebCore.vcproj/WebCore.vcproj: * WebCore.xcodeproj/project.pbxproj: * storage/LocalStorageTask.h: Removed. * storage/StorageSyncManager.cpp: (WebCore::StorageSyncManager::StorageSyncManager): (WebCore::StorageSyncManager::scheduleImport): (WebCore::StorageSyncManager::scheduleSync): (WebCore::StorageSyncManager::scheduleDeleteEmptyDatabase): * storage/StorageSyncManager.h: (WebCore): (StorageSyncManager): * storage/StorageTask.cpp: Renamed from Source/WebCore/storage/LocalStorageTask.cpp. (WebCore): (WebCore::StorageTask::StorageTask): (WebCore::StorageTask::~StorageTask): (WebCore::StorageTask::performTask): * storage/StorageTask.h: Added. (WebCore): (StorageTask): (WebCore::StorageTask::createImport): (WebCore::StorageTask::createSync): (WebCore::StorageTask::createDeleteEmptyDatabase): (WebCore::StorageTask::createOriginIdentifiersImport): (WebCore::StorageTask::createSetOriginDetails): (WebCore::StorageTask::createDeleteOrigin): (WebCore::StorageTask::createDeleteAllOrigins): (WebCore::StorageTask::createTerminate): * storage/StorageThread.cpp: Renamed from Source/WebCore/storage/LocalStorageThread.cpp. (WebCore): (WebCore::StorageThread::create): (WebCore::StorageThread::StorageThread): (WebCore::StorageThread::~StorageThread): (WebCore::StorageThread::start): (WebCore::StorageThread::threadEntryPointCallback): (WebCore::StorageThread::threadEntryPoint): (WebCore::StorageThread::scheduleTask): (WebCore::StorageThread::terminate): (WebCore::StorageThread::performTerminate): * storage/StorageThread.h: Renamed from Source/WebCore/storage/LocalStorageThread.h. (WebCore): (StorageThread): * storage/StorageTracker.cpp: (WebCore::StorageTracker::StorageTracker): (WebCore::StorageTracker::importOriginIdentifiers): (WebCore::StorageTracker::setOriginDetails): (WebCore::StorageTracker::scheduleTask): (WebCore::StorageTracker::deleteAllOrigins): (WebCore::StorageTracker::deleteOrigin): * storage/StorageTracker.h: (WebCore): (StorageTracker): * storage/wince/StorageThreadWinCE.cpp: Renamed from Source/WebCore/storage/wince/LocalStorageThreadWinCE.cpp. (WebCore): (WebCore::StorageThread::StorageThread): (WebCore::StorageThread::~StorageThread): (WebCore::StorageThread::start): (WebCore::StorageThread::timerFired): (WebCore::StorageThread::scheduleImport): (WebCore::StorageThread::scheduleSync): (WebCore::StorageThread::terminate): (WebCore::StorageThread::performTerminate): * storage/wince/StorageThreadWinCE.h: Renamed from Source/WebCore/storage/wince/LocalStorageThreadWinCE.h. (WebCore): (StorageThread): (WebCore::StorageThread::create): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108746 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/CMakeLists.txt | 4 +- Source/WebCore/ChangeLog | 80 ++++++++++++++++++++++ Source/WebCore/GNUmakefile.list.am | 8 +-- Source/WebCore/Target.pri | 8 +-- Source/WebCore/WebCore.gypi | 12 ++-- Source/WebCore/WebCore.order | 38 +++++----- Source/WebCore/WebCore.vcproj/WebCore.vcproj | 8 +-- Source/WebCore/WebCore.xcodeproj/project.pbxproj | 32 ++++----- Source/WebCore/storage/LocalStorageTask.h | 73 -------------------- Source/WebCore/storage/StorageSyncManager.cpp | 12 ++-- Source/WebCore/storage/StorageSyncManager.h | 4 +- .../{LocalStorageTask.cpp => StorageTask.cpp} | 22 +++--- Source/WebCore/storage/StorageTask.h | 72 +++++++++++++++++++ .../{LocalStorageThread.cpp => StorageThread.cpp} | 32 ++++----- .../{LocalStorageThread.h => StorageThread.h} | 23 +++---- Source/WebCore/storage/StorageTracker.cpp | 16 ++--- Source/WebCore/storage/StorageTracker.h | 6 +- ...orageThreadWinCE.cpp => StorageThreadWinCE.cpp} | 28 ++++---- ...alStorageThreadWinCE.h => StorageThreadWinCE.h} | 22 +++--- 19 files changed, 289 insertions(+), 211 deletions(-) delete mode 100644 Source/WebCore/storage/LocalStorageTask.h rename Source/WebCore/storage/{LocalStorageTask.cpp => StorageTask.cpp} (84%) create mode 100644 Source/WebCore/storage/StorageTask.h rename Source/WebCore/storage/{LocalStorageThread.cpp => StorageThread.cpp} (71%) rename Source/WebCore/storage/{LocalStorageThread.h => StorageThread.h} (79%) rename Source/WebCore/storage/wince/{LocalStorageThreadWinCE.cpp => StorageThreadWinCE.cpp} (70%) rename Source/WebCore/storage/wince/{LocalStorageThreadWinCE.h => StorageThreadWinCE.h} (74%) diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt index e90aa6b..78360d8 100644 --- a/Source/WebCore/CMakeLists.txt +++ b/Source/WebCore/CMakeLists.txt @@ -1402,8 +1402,8 @@ SET(WebCore_SOURCES storage/IDBFactory.cpp storage/IDBFactoryBackendInterface.cpp storage/IDBFactoryBackendImpl.cpp - storage/LocalStorageTask.cpp - storage/LocalStorageThread.cpp + storage/StorageTask.cpp + storage/StorageThread.cpp storage/OriginQuotaManager.cpp storage/OriginUsageRecord.cpp storage/SQLException.cpp diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 2722625..8c3b3ce 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,83 @@ +2012-02-24 Huang Dongsung + + Rename LocalStorageThread to StorageThread and LocalStorageTask to StorageTask. + https://bugs.webkit.org/show_bug.cgi?id=79358 + + Revision 45124 commented FIXME to rename these classes. + + Reviewed by Kentaro Hara. + + * CMakeLists.txt: + * GNUmakefile.list.am: + * Target.pri: + * WebCore.gypi: + * WebCore.order: + * WebCore.vcproj/WebCore.vcproj: + * WebCore.xcodeproj/project.pbxproj: + * storage/LocalStorageTask.h: Removed. + * storage/StorageSyncManager.cpp: + (WebCore::StorageSyncManager::StorageSyncManager): + (WebCore::StorageSyncManager::scheduleImport): + (WebCore::StorageSyncManager::scheduleSync): + (WebCore::StorageSyncManager::scheduleDeleteEmptyDatabase): + * storage/StorageSyncManager.h: + (WebCore): + (StorageSyncManager): + * storage/StorageTask.cpp: Renamed from Source/WebCore/storage/LocalStorageTask.cpp. + (WebCore): + (WebCore::StorageTask::StorageTask): + (WebCore::StorageTask::~StorageTask): + (WebCore::StorageTask::performTask): + * storage/StorageTask.h: Added. + (WebCore): + (StorageTask): + (WebCore::StorageTask::createImport): + (WebCore::StorageTask::createSync): + (WebCore::StorageTask::createDeleteEmptyDatabase): + (WebCore::StorageTask::createOriginIdentifiersImport): + (WebCore::StorageTask::createSetOriginDetails): + (WebCore::StorageTask::createDeleteOrigin): + (WebCore::StorageTask::createDeleteAllOrigins): + (WebCore::StorageTask::createTerminate): + * storage/StorageThread.cpp: Renamed from Source/WebCore/storage/LocalStorageThread.cpp. + (WebCore): + (WebCore::StorageThread::create): + (WebCore::StorageThread::StorageThread): + (WebCore::StorageThread::~StorageThread): + (WebCore::StorageThread::start): + (WebCore::StorageThread::threadEntryPointCallback): + (WebCore::StorageThread::threadEntryPoint): + (WebCore::StorageThread::scheduleTask): + (WebCore::StorageThread::terminate): + (WebCore::StorageThread::performTerminate): + * storage/StorageThread.h: Renamed from Source/WebCore/storage/LocalStorageThread.h. + (WebCore): + (StorageThread): + * storage/StorageTracker.cpp: + (WebCore::StorageTracker::StorageTracker): + (WebCore::StorageTracker::importOriginIdentifiers): + (WebCore::StorageTracker::setOriginDetails): + (WebCore::StorageTracker::scheduleTask): + (WebCore::StorageTracker::deleteAllOrigins): + (WebCore::StorageTracker::deleteOrigin): + * storage/StorageTracker.h: + (WebCore): + (StorageTracker): + * storage/wince/StorageThreadWinCE.cpp: Renamed from Source/WebCore/storage/wince/LocalStorageThreadWinCE.cpp. + (WebCore): + (WebCore::StorageThread::StorageThread): + (WebCore::StorageThread::~StorageThread): + (WebCore::StorageThread::start): + (WebCore::StorageThread::timerFired): + (WebCore::StorageThread::scheduleImport): + (WebCore::StorageThread::scheduleSync): + (WebCore::StorageThread::terminate): + (WebCore::StorageThread::performTerminate): + * storage/wince/StorageThreadWinCE.h: Renamed from Source/WebCore/storage/wince/LocalStorageThreadWinCE.h. + (WebCore): + (StorageThread): + (WebCore::StorageThread::create): + 2012-02-23 Pavel Feldman Web Inspector: prepare border images on timelines to enable zooming. diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am index 8e3ac95..9504091 100644 --- a/Source/WebCore/GNUmakefile.list.am +++ b/Source/WebCore/GNUmakefile.list.am @@ -3898,10 +3898,10 @@ webcore_sources += \ Source/WebCore/storage/IDBTransaction.h \ Source/WebCore/storage/IDBVersionChangeEvent.h \ Source/WebCore/storage/IDBVersionChangeRequest.h \ - Source/WebCore/storage/LocalStorageTask.cpp \ - Source/WebCore/storage/LocalStorageTask.h \ - Source/WebCore/storage/LocalStorageThread.cpp \ - Source/WebCore/storage/LocalStorageThread.h \ + Source/WebCore/storage/StorageTask.cpp \ + Source/WebCore/storage/StorageTask.h \ + Source/WebCore/storage/StorageThread.cpp \ + Source/WebCore/storage/StorageThread.h \ Source/WebCore/storage/OriginQuotaManager.cpp \ Source/WebCore/storage/OriginQuotaManager.h \ Source/WebCore/storage/OriginUsageRecord.cpp \ diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri index dbbf7af..e95ed4e 100644 --- a/Source/WebCore/Target.pri +++ b/Source/WebCore/Target.pri @@ -1301,8 +1301,8 @@ SOURCES += \ storage/Database.cpp \ storage/DatabaseAuthorizer.cpp \ storage/DatabaseSync.cpp \ - storage/LocalStorageTask.cpp \ - storage/LocalStorageThread.cpp \ + storage/StorageTask.cpp \ + storage/StorageThread.cpp \ storage/Storage.cpp \ storage/StorageAreaImpl.cpp \ storage/StorageAreaSync.cpp \ @@ -2520,8 +2520,8 @@ HEADERS += \ storage/DatabaseTask.h \ storage/DatabaseThread.h \ storage/DatabaseTracker.h \ - storage/LocalStorageTask.h \ - storage/LocalStorageThread.h \ + storage/StorageTask.h \ + storage/StorageThread.h \ storage/OriginQuotaManager.h \ storage/OriginUsageRecord.h \ storage/SQLCallbackWrapper.h \ diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi index c9569a3..04822f8 100644 --- a/Source/WebCore/WebCore.gypi +++ b/Source/WebCore/WebCore.gypi @@ -4685,10 +4685,10 @@ 'storage/IDBVersionChangeEvent.h', 'storage/IDBVersionChangeRequest.cpp', 'storage/IDBVersionChangeRequest.h', - 'storage/LocalStorageTask.cpp', - 'storage/LocalStorageTask.h', - 'storage/LocalStorageThread.cpp', - 'storage/LocalStorageThread.h', + 'storage/StorageTask.cpp', + 'storage/StorageTask.h', + 'storage/StorageThread.cpp', + 'storage/StorageThread.h', 'storage/OriginQuotaManager.cpp', 'storage/OriginQuotaManager.h', 'storage/OriginUsageRecord.cpp', @@ -4743,8 +4743,8 @@ 'storage/chromium/SQLTransactionClientChromium.cpp', 'storage/wince/DatabaseThreadWinCE.cpp', 'storage/wince/DatabaseThreadWinCE.h', - 'storage/wince/LocalStorageThreadWinCE.cpp', - 'storage/wince/LocalStorageThreadWinCE.h', + 'storage/wince/StorageThreadWinCE.cpp', + 'storage/wince/StorageThreadWinCE.h', 'webaudio/AudioBasicProcessorNode.cpp', 'webaudio/AudioBasicProcessorNode.h', 'webaudio/AudioBuffer.cpp', diff --git a/Source/WebCore/WebCore.order b/Source/WebCore/WebCore.order index ddba1ec..952c299 100644 --- a/Source/WebCore/WebCore.order +++ b/Source/WebCore/WebCore.order @@ -445,23 +445,23 @@ __ZN7WebCore16SQLiteFileSystem24ensureDatabaseFileExistsERKN3WTF6StringEb __ZN7WebCore15DatabaseTracker7trackerEv __ZN7WebCore15DatabaseTracker9setClientEPNS_21DatabaseTrackerClientE __ZN7WebCore14StorageTracker17initializeTrackerERKN3WTF6StringE -__ZN7WebCore18LocalStorageThread6createEv +__ZN7WebCore13StorageThread6createEv __ZN7WebCore14StorageTracker23setStorageDirectoryPathERKN3WTF6StringE -__ZN7WebCore18LocalStorageThread5startEv +__ZN7WebCore13StorageThread5startEv __ZN7WebCore14StorageTracker23importOriginIdentifiersEv -__ZN7WebCore16LocalStorageTaskC1ENS0_4TypeE -__ZN7WebCore18LocalStorageThread12scheduleTaskEN3WTF10PassOwnPtrINS_16LocalStorageTaskEEE -__ZN3WTF5DequeIPN7WebCore16LocalStorageTaskELm0EE14expandCapacityEv +__ZN7WebCore11StorageTaskC1ENS0_4TypeE +__ZN7WebCore13StorageThread12scheduleTaskEN3WTF10PassOwnPtrINS_11StorageTaskEEE +__ZN3WTF5DequeIPN7WebCore11StorageTaskELm0EE14expandCapacityEv __ZN7WebCore14StorageTracker7trackerEv __ZN7WebCore14StorageTracker9setClientEPNS_20StorageTrackerClientE __ZN7WebCore12cacheStorageEv -__ZN7WebCore18LocalStorageThread24threadEntryPointCallbackEPv +__ZN7WebCore13StorageThread24threadEntryPointCallbackEPv __ZN7WebCore23ApplicationCacheStorage17setCacheDirectoryERKN3WTF6StringE -__ZN7WebCore18LocalStorageThread16threadEntryPointEv -__ZN3WTF12MessageQueueIN7WebCore16LocalStorageTaskEE14waitForMessageEv -__ZN3WTF12MessageQueueIN7WebCore16LocalStorageTaskEE19alwaysTruePredicateEPS2_ +__ZN7WebCore13StorageThread16threadEntryPointEv +__ZN3WTF12MessageQueueIN7WebCore11StorageTaskEE14waitForMessageEv +__ZN3WTF12MessageQueueIN7WebCore11StorageTaskEE19alwaysTruePredicateEPS2_ __ZN7WebCore21setPlatformStrategiesEPNS_18PlatformStrategiesE -__ZN7WebCore16LocalStorageTask11performTaskEv +__ZN7WebCore11StorageTask11performTaskEv __ZN7WebCore8Settings29setDefaultMinDOMTimerIntervalEd __ZN7WebCore14StorageTracker27syncImportOriginIdentifiersEv __ZN7WebCore4Page11PageClientsC1Ev @@ -471,7 +471,7 @@ __ZN7WebCore13listDirectoryERKN3WTF6StringES3_ __ZN7WebCore4PageC1ERNS0_11PageClientsE __ZN3WTF6VectorINS_6StringELm0EEaSERKS2_ __ZN7WebCore4PageC2ERNS0_11PageClientsE -__ZN7WebCore16LocalStorageTaskD1Ev +__ZN7WebCore11StorageTaskD1Ev __ZN7WebCore6ChromeC1EPNS_4PageEPNS_12ChromeClientE __ZN7WebCore19DragCaretControllerC1Ev __ZN7WebCore14DragControllerC1EPNS_4PageEPNS_10DragClientE @@ -19984,7 +19984,7 @@ __ZNK7WebCore14SecurityOrigin18databaseIdentifierEv __ZN7WebCore17encodeForFileNameERKN3WTF6StringE __ZN7WebCore15StorageAreaSync6createEN3WTF10PassRefPtrINS_18StorageSyncManagerEEENS2_INS_15StorageAreaImplEEERKNS1_6StringE __ZN7WebCore18StorageSyncManager14scheduleImportEN3WTF10PassRefPtrINS_15StorageAreaSyncEEE -__ZN7WebCore16LocalStorageTaskC1ENS0_4TypeEPNS_15StorageAreaSyncE +__ZN7WebCore11StorageTaskC1ENS0_4TypeEPNS_15StorageAreaSyncE __ZN7WebCore15StorageAreaSync13performImportEv __ZN7WebCore15StorageAreaSync12openDatabaseENS0_21OpenDatabaseParamTypeE __ZN7WebCore18StorageSyncManager20fullDatabaseFilenameERKN3WTF6StringE @@ -25831,7 +25831,7 @@ __ZN7WebCore15StorageAreaSync11performSyncEv __ZN7WebCore15StorageAreaSync4syncEbRKN3WTF7HashMapINS1_6StringES3_NS1_10StringHashENS1_10HashTraitsIS3_EES6_EE __ZN7WebCore14StorageTracker20cancelDeletingOriginERKN3WTF6StringE __ZN7WebCore14StorageTracker16setOriginDetailsERKN3WTF6StringES4_ -__ZN7WebCore16LocalStorageTaskC1ENS0_4TypeERKN3WTF6StringES5_ +__ZN7WebCore11StorageTaskC1ENS0_4TypeERKN3WTF6StringES5_ __ZN7WebCore14StorageTracker12scheduleTaskEPv __ZN7WebCore14StorageTracker20syncSetOriginDetailsERKN3WTF6StringES4_ __ZN7WebCore26setJSDOMWindowOnhashchangeEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE @@ -27419,12 +27419,12 @@ __ZN7WebCore15StorageAreaImpl5closeEv __ZN7WebCore15StorageAreaSync17scheduleFinalSyncEv __ZN7WebCore18StorageSyncManager27scheduleDeleteEmptyDatabaseEN3WTF10PassRefPtrINS_15StorageAreaSyncEEE __ZN7WebCore18StorageSyncManager5closeEv -__ZN7WebCore18LocalStorageThread9terminateEv -__ZN7WebCore16LocalStorageTaskC1ENS0_4TypeEPNS_18LocalStorageThreadE +__ZN7WebCore13StorageThread9terminateEv +__ZN7WebCore11StorageTaskC1ENS0_4TypeEPNS_13StorageThreadE __ZN7WebCore15StorageAreaSync19deleteEmptyDatabaseEv -__ZN7WebCore18LocalStorageThread16performTerminateEv -__ZN7WebCore18LocalStorageThreadD1Ev -__ZN3WTF12MessageQueueIN7WebCore16LocalStorageTaskEED1Ev +__ZN7WebCore13StorageThread16performTerminateEv +__ZN7WebCore13StorageThreadD1Ev +__ZN3WTF12MessageQueueIN7WebCore11StorageTaskEED1Ev __ZN7WebCore28InspectorFrontendClientLocalD2Ev __ZN7WebCore21InspectorFrontendHost16disconnectClientEv __ZN7WebCore23JSInspectorFrontendHostD1Ev @@ -28682,7 +28682,7 @@ __ZN7WebCore14StorageTracker12deleteOriginEPNS_14SecurityOriginE __ZN7WebCore9PageGroup26clearLocalStorageForOriginEPNS_14SecurityOriginE __ZN7WebCore20StorageNamespaceImpl22clearOriginForDeletionEPNS_14SecurityOriginE __ZNK3WTF7HashMapINS_6RefPtrIN7WebCore14SecurityOriginEEENS1_INS2_15StorageAreaImplEEENS2_18SecurityOriginHashENS_10HashTraitsIS4_EENS8_IS6_EEE3getEPS3_ -__ZN7WebCore16LocalStorageTaskC1ENS0_4TypeERKN3WTF6StringE +__ZN7WebCore11StorageTaskC1ENS0_4TypeERKN3WTF6StringE __ZN7WebCore14StorageTracker16syncDeleteOriginERKN3WTF6StringE __ZN7WebCore14StorageTracker21databasePathForOriginERKN3WTF6StringE __ZN7WebCore14StorageTracker18diskUsageForOriginEPNS_14SecurityOriginE diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj index d788dd2..fd7f71b 100755 --- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj +++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj @@ -70926,19 +70926,19 @@ > -#include - -namespace WebCore { - - class StorageAreaSync; - class LocalStorageThread; - - // FIXME: Rename this class to StorageTask - class LocalStorageTask { - WTF_MAKE_NONCOPYABLE(LocalStorageTask); WTF_MAKE_FAST_ALLOCATED; - public: - enum Type { AreaImport, AreaSync, DeleteEmptyDatabase, SetOriginDetails, ImportOrigins, DeleteAllOrigins, DeleteOrigin, TerminateThread }; - - ~LocalStorageTask(); - - static PassOwnPtr createImport(StorageAreaSync* area) { return adoptPtr(new LocalStorageTask(AreaImport, area)); } - static PassOwnPtr createSync(StorageAreaSync* area) { return adoptPtr(new LocalStorageTask(AreaSync, area)); } - static PassOwnPtr createDeleteEmptyDatabase(StorageAreaSync* area) { return adoptPtr(new LocalStorageTask(DeleteEmptyDatabase, area)); } - static PassOwnPtr createOriginIdentifiersImport() { return adoptPtr(new LocalStorageTask(ImportOrigins)); } - static PassOwnPtr createSetOriginDetails(const String& originIdentifier, const String& databaseFilename) { return adoptPtr(new LocalStorageTask(SetOriginDetails, originIdentifier, databaseFilename)); } - static PassOwnPtr createDeleteOrigin(const String& originIdentifier) { return adoptPtr(new LocalStorageTask(DeleteOrigin, originIdentifier)); } - static PassOwnPtr createDeleteAllOrigins() { return adoptPtr(new LocalStorageTask(DeleteAllOrigins)); } - static PassOwnPtr createTerminate(LocalStorageThread* thread) { return adoptPtr(new LocalStorageTask(TerminateThread, thread)); } - - void performTask(); - - private: - LocalStorageTask(Type, StorageAreaSync*); - LocalStorageTask(Type, LocalStorageThread*); - LocalStorageTask(Type, const String& originIdentifier); - LocalStorageTask(Type, const String& originIdentifier, const String& databaseFilename); - LocalStorageTask(Type); - - Type m_type; - StorageAreaSync* m_area; - LocalStorageThread* m_thread; - String m_originIdentifier; - String m_databaseFilename; - }; - -} // namespace WebCore - -#endif // LocalStorageTask_h diff --git a/Source/WebCore/storage/StorageSyncManager.cpp b/Source/WebCore/storage/StorageSyncManager.cpp index c05de98..c39fe0d 100644 --- a/Source/WebCore/storage/StorageSyncManager.cpp +++ b/Source/WebCore/storage/StorageSyncManager.cpp @@ -30,8 +30,8 @@ #include "FileSystem.h" #include "Frame.h" #include "FrameTree.h" -#include "LocalStorageTask.h" -#include "LocalStorageThread.h" +#include "StorageTask.h" +#include "StorageThread.h" #include "Page.h" #include "PageGroup.h" #include "StorageAreaSync.h" @@ -47,7 +47,7 @@ PassRefPtr StorageSyncManager::create(const String& path) } StorageSyncManager::StorageSyncManager(const String& path) - : m_thread(LocalStorageThread::create()) + : m_thread(StorageThread::create()) , m_path(path.isolatedCopy()) { ASSERT(isMainThread()); @@ -87,7 +87,7 @@ bool StorageSyncManager::scheduleImport(PassRefPtr area) ASSERT(isMainThread()); ASSERT(m_thread); if (m_thread) - m_thread->scheduleTask(LocalStorageTask::createImport(area.get())); + m_thread->scheduleTask(StorageTask::createImport(area.get())); return m_thread; } @@ -96,7 +96,7 @@ void StorageSyncManager::scheduleSync(PassRefPtr area) ASSERT(isMainThread()); ASSERT(m_thread); if (m_thread) - m_thread->scheduleTask(LocalStorageTask::createSync(area.get())); + m_thread->scheduleTask(StorageTask::createSync(area.get())); } void StorageSyncManager::scheduleDeleteEmptyDatabase(PassRefPtr area) @@ -104,7 +104,7 @@ void StorageSyncManager::scheduleDeleteEmptyDatabase(PassRefPtr ASSERT(isMainThread()); ASSERT(m_thread); if (m_thread) - m_thread->scheduleTask(LocalStorageTask::createDeleteEmptyDatabase(area.get())); + m_thread->scheduleTask(StorageTask::createDeleteEmptyDatabase(area.get())); } } // namespace WebCore diff --git a/Source/WebCore/storage/StorageSyncManager.h b/Source/WebCore/storage/StorageSyncManager.h index 5e0f165..e278337 100644 --- a/Source/WebCore/storage/StorageSyncManager.h +++ b/Source/WebCore/storage/StorageSyncManager.h @@ -34,7 +34,7 @@ namespace WebCore { - class LocalStorageThread; + class StorageThread; class SecurityOrigin; class StorageAreaSync; @@ -52,7 +52,7 @@ namespace WebCore { private: StorageSyncManager(const String& path); - OwnPtr m_thread; + OwnPtr m_thread; // The following members are subject to thread synchronization issues public: diff --git a/Source/WebCore/storage/LocalStorageTask.cpp b/Source/WebCore/storage/StorageTask.cpp similarity index 84% rename from Source/WebCore/storage/LocalStorageTask.cpp rename to Source/WebCore/storage/StorageTask.cpp index 39b16b4..47aabe9 100644 --- a/Source/WebCore/storage/LocalStorageTask.cpp +++ b/Source/WebCore/storage/StorageTask.cpp @@ -24,15 +24,15 @@ */ #include "config.h" -#include "LocalStorageTask.h" +#include "StorageTask.h" -#include "LocalStorageThread.h" +#include "StorageThread.h" #include "StorageAreaSync.h" #include "StorageTracker.h" namespace WebCore { -LocalStorageTask::LocalStorageTask(Type type, StorageAreaSync* area) +StorageTask::StorageTask(Type type, StorageAreaSync* area) : m_type(type) , m_area(area) , m_thread(0) @@ -41,7 +41,7 @@ LocalStorageTask::LocalStorageTask(Type type, StorageAreaSync* area) ASSERT(m_type == AreaImport || m_type == AreaSync || m_type == DeleteEmptyDatabase); } -LocalStorageTask::LocalStorageTask(Type type, LocalStorageThread* thread) +StorageTask::StorageTask(Type type, StorageThread* thread) : m_type(type) , m_area(0) , m_thread(thread) @@ -49,21 +49,21 @@ LocalStorageTask::LocalStorageTask(Type type, LocalStorageThread* thread) ASSERT(m_thread); ASSERT(m_type == TerminateThread); } - -LocalStorageTask::LocalStorageTask(Type type) + +StorageTask::StorageTask(Type type) : m_type(type) { ASSERT(m_type == ImportOrigins || m_type == DeleteAllOrigins); } - -LocalStorageTask::LocalStorageTask(Type type, const String& originIdentifier) + +StorageTask::StorageTask(Type type, const String& originIdentifier) : m_type(type) , m_originIdentifier(originIdentifier) { ASSERT(m_type == DeleteOrigin); } -LocalStorageTask::LocalStorageTask(Type type, const String& originIdentifier, const String& databaseFilename) +StorageTask::StorageTask(Type type, const String& originIdentifier, const String& databaseFilename) : m_type(type) , m_originIdentifier(originIdentifier) , m_databaseFilename(databaseFilename) @@ -71,11 +71,11 @@ LocalStorageTask::LocalStorageTask(Type type, const String& originIdentifier, co ASSERT(m_type == SetOriginDetails); } -LocalStorageTask::~LocalStorageTask() +StorageTask::~StorageTask() { } -void LocalStorageTask::performTask() +void StorageTask::performTask() { switch (m_type) { case AreaImport: diff --git a/Source/WebCore/storage/StorageTask.h b/Source/WebCore/storage/StorageTask.h new file mode 100644 index 0000000..7d0523f --- /dev/null +++ b/Source/WebCore/storage/StorageTask.h @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2008 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. ``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 + * 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 StorageTask_h +#define StorageTask_h + +#include "PlatformString.h" +#include +#include + +namespace WebCore { + + class StorageAreaSync; + class StorageThread; + + class StorageTask { + WTF_MAKE_NONCOPYABLE(StorageTask); WTF_MAKE_FAST_ALLOCATED; + public: + enum Type { AreaImport, AreaSync, DeleteEmptyDatabase, SetOriginDetails, ImportOrigins, DeleteAllOrigins, DeleteOrigin, TerminateThread }; + + ~StorageTask(); + + static PassOwnPtr createImport(StorageAreaSync* area) { return adoptPtr(new StorageTask(AreaImport, area)); } + static PassOwnPtr createSync(StorageAreaSync* area) { return adoptPtr(new StorageTask(AreaSync, area)); } + static PassOwnPtr createDeleteEmptyDatabase(StorageAreaSync* area) { return adoptPtr(new StorageTask(DeleteEmptyDatabase, area)); } + static PassOwnPtr createOriginIdentifiersImport() { return adoptPtr(new StorageTask(ImportOrigins)); } + static PassOwnPtr createSetOriginDetails(const String& originIdentifier, const String& databaseFilename) { return adoptPtr(new StorageTask(SetOriginDetails, originIdentifier, databaseFilename)); } + static PassOwnPtr createDeleteOrigin(const String& originIdentifier) { return adoptPtr(new StorageTask(DeleteOrigin, originIdentifier)); } + static PassOwnPtr createDeleteAllOrigins() { return adoptPtr(new StorageTask(DeleteAllOrigins)); } + static PassOwnPtr createTerminate(StorageThread* thread) { return adoptPtr(new StorageTask(TerminateThread, thread)); } + + void performTask(); + + private: + StorageTask(Type, StorageAreaSync*); + StorageTask(Type, StorageThread*); + StorageTask(Type, const String& originIdentifier); + StorageTask(Type, const String& originIdentifier, const String& databaseFilename); + StorageTask(Type); + + Type m_type; + StorageAreaSync* m_area; + StorageThread* m_thread; + String m_originIdentifier; + String m_databaseFilename; + }; + +} // namespace WebCore + +#endif // StorageTask_h diff --git a/Source/WebCore/storage/LocalStorageThread.cpp b/Source/WebCore/storage/StorageThread.cpp similarity index 71% rename from Source/WebCore/storage/LocalStorageThread.cpp rename to Source/WebCore/storage/StorageThread.cpp index a8e44b6..623d7ea 100644 --- a/Source/WebCore/storage/LocalStorageThread.cpp +++ b/Source/WebCore/storage/StorageThread.cpp @@ -24,58 +24,58 @@ */ #include "config.h" -#include "LocalStorageThread.h" +#include "StorageThread.h" -#include "LocalStorageTask.h" +#include "StorageTask.h" #include "StorageAreaSync.h" #include namespace WebCore { -PassOwnPtr LocalStorageThread::create() +PassOwnPtr StorageThread::create() { - return adoptPtr(new LocalStorageThread); + return adoptPtr(new StorageThread); } -LocalStorageThread::LocalStorageThread() +StorageThread::StorageThread() : m_threadID(0) { } -LocalStorageThread::~LocalStorageThread() +StorageThread::~StorageThread() { ASSERT(isMainThread()); ASSERT(!m_threadID); } -bool LocalStorageThread::start() +bool StorageThread::start() { ASSERT(isMainThread()); if (!m_threadID) - m_threadID = createThread(LocalStorageThread::threadEntryPointCallback, this, "WebCore: LocalStorage"); + m_threadID = createThread(StorageThread::threadEntryPointCallback, this, "WebCore: LocalStorage"); return m_threadID; } -void LocalStorageThread::threadEntryPointCallback(void* thread) +void StorageThread::threadEntryPointCallback(void* thread) { - static_cast(thread)->threadEntryPoint(); + static_cast(thread)->threadEntryPoint(); } -void LocalStorageThread::threadEntryPoint() +void StorageThread::threadEntryPoint() { ASSERT(!isMainThread()); - while (OwnPtr task = m_queue.waitForMessage()) + while (OwnPtr task = m_queue.waitForMessage()) task->performTask(); } -void LocalStorageThread::scheduleTask(PassOwnPtr task) +void StorageThread::scheduleTask(PassOwnPtr task) { ASSERT(isMainThread()); ASSERT(!m_queue.killed() && m_threadID); m_queue.append(task); } -void LocalStorageThread::terminate() +void StorageThread::terminate() { ASSERT(isMainThread()); ASSERT(!m_queue.killed() && m_threadID); @@ -83,13 +83,13 @@ void LocalStorageThread::terminate() if (!m_threadID) return; - m_queue.append(LocalStorageTask::createTerminate(this)); + m_queue.append(StorageTask::createTerminate(this)); waitForThreadCompletion(m_threadID); ASSERT(m_queue.killed()); m_threadID = 0; } -void LocalStorageThread::performTerminate() +void StorageThread::performTerminate() { ASSERT(!isMainThread()); m_queue.kill(); diff --git a/Source/WebCore/storage/LocalStorageThread.h b/Source/WebCore/storage/StorageThread.h similarity index 79% rename from Source/WebCore/storage/LocalStorageThread.h rename to Source/WebCore/storage/StorageThread.h index 434f31d..a484118 100644 --- a/Source/WebCore/storage/LocalStorageThread.h +++ b/Source/WebCore/storage/StorageThread.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef LocalStorageThread_h -#define LocalStorageThread_h +#ifndef StorageThread_h +#define StorageThread_h #include #include @@ -35,33 +35,32 @@ namespace WebCore { class StorageAreaSync; - class LocalStorageTask; + class StorageTask; - // FIXME: Rename this class to StorageThread - class LocalStorageThread { - WTF_MAKE_NONCOPYABLE(LocalStorageThread); WTF_MAKE_FAST_ALLOCATED; + class StorageThread { + WTF_MAKE_NONCOPYABLE(StorageThread); WTF_MAKE_FAST_ALLOCATED; public: - static PassOwnPtr create(); - ~LocalStorageThread(); + static PassOwnPtr create(); + ~StorageThread(); bool start(); void terminate(); - void scheduleTask(PassOwnPtr); + void scheduleTask(PassOwnPtr); // Background thread part of the terminate procedure. void performTerminate(); private: - LocalStorageThread(); + StorageThread(); // Called on background thread. static void threadEntryPointCallback(void*); void threadEntryPoint(); ThreadIdentifier m_threadID; - MessageQueue m_queue; + MessageQueue m_queue; }; } // namespace WebCore -#endif // LocalStorageThread_h +#endif // StorageThread_h diff --git a/Source/WebCore/storage/StorageTracker.cpp b/Source/WebCore/storage/StorageTracker.cpp index f981e6b..9e18dd4 100644 --- a/Source/WebCore/storage/StorageTracker.cpp +++ b/Source/WebCore/storage/StorageTracker.cpp @@ -28,8 +28,8 @@ #include "DatabaseThread.h" #include "FileSystem.h" -#include "LocalStorageTask.h" -#include "LocalStorageThread.h" +#include "StorageTask.h" +#include "StorageThread.h" #include "Logging.h" #include "PageGroup.h" #include "SQLiteFileSystem.h" @@ -87,7 +87,7 @@ StorageTracker& StorageTracker::tracker() StorageTracker::StorageTracker(const String& storagePath) : m_storageDirectoryPath(storagePath.isolatedCopy()) , m_client(0) - , m_thread(LocalStorageThread::create()) + , m_thread(StorageThread::create()) , m_isActive(false) , m_needsInitialization(false) , m_finishedImportingOriginIdentifiers(false) @@ -163,7 +163,7 @@ void StorageTracker::importOriginIdentifiers() ASSERT(isMainThread()); ASSERT(m_thread); - m_thread->scheduleTask(LocalStorageTask::createOriginIdentifiersImport()); + m_thread->scheduleTask(StorageTask::createOriginIdentifiersImport()); } void StorageTracker::notifyFinishedImportingOriginIdentifiersOnMainThread(void*) @@ -297,7 +297,7 @@ void StorageTracker::setOriginDetails(const String& originIdentifier, const Stri m_originSet.add(originIdentifier); } - OwnPtr task = LocalStorageTask::createSetOriginDetails(originIdentifier.isolatedCopy(), databaseFile); + OwnPtr task = StorageTask::createSetOriginDetails(originIdentifier.isolatedCopy(), databaseFile); if (isMainThread()) { ASSERT(m_thread); @@ -311,7 +311,7 @@ void StorageTracker::scheduleTask(void* taskIn) ASSERT(isMainThread()); ASSERT(StorageTracker::tracker().m_thread); - OwnPtr task = adoptPtr(reinterpret_cast(taskIn)); + OwnPtr task = adoptPtr(reinterpret_cast(taskIn)); StorageTracker::tracker().m_thread->scheduleTask(task.release()); } @@ -383,7 +383,7 @@ void StorageTracker::deleteAllOrigins() PageGroup::clearLocalStorageForAllOrigins(); - m_thread->scheduleTask(LocalStorageTask::createDeleteAllOrigins()); + m_thread->scheduleTask(StorageTask::createDeleteAllOrigins()); } void StorageTracker::syncDeleteAllOrigins() @@ -479,7 +479,7 @@ void StorageTracker::deleteOrigin(SecurityOrigin* origin) m_originSet.remove(originId); } - m_thread->scheduleTask(LocalStorageTask::createDeleteOrigin(originId)); + m_thread->scheduleTask(StorageTask::createDeleteOrigin(originId)); } void StorageTracker::syncDeleteOrigin(const String& originIdentifier) diff --git a/Source/WebCore/storage/StorageTracker.h b/Source/WebCore/storage/StorageTracker.h index d7cb824..9e1945a 100644 --- a/Source/WebCore/storage/StorageTracker.h +++ b/Source/WebCore/storage/StorageTracker.h @@ -35,8 +35,8 @@ namespace WebCore { -class LocalStorageTask; -class LocalStorageThread; +class StorageTask; +class StorageThread; class SecurityOrigin; class StorageTrackerClient; @@ -113,7 +113,7 @@ private: OriginSet m_originSet; OriginSet m_originsBeingDeleted; - OwnPtr m_thread; + OwnPtr m_thread; bool m_isActive; bool m_needsInitialization; diff --git a/Source/WebCore/storage/wince/LocalStorageThreadWinCE.cpp b/Source/WebCore/storage/wince/StorageThreadWinCE.cpp similarity index 70% rename from Source/WebCore/storage/wince/LocalStorageThreadWinCE.cpp rename to Source/WebCore/storage/wince/StorageThreadWinCE.cpp index 90c4e89..25e896f 100644 --- a/Source/WebCore/storage/wince/LocalStorageThreadWinCE.cpp +++ b/Source/WebCore/storage/wince/StorageThreadWinCE.cpp @@ -22,31 +22,31 @@ */ #include "config.h" -#include "LocalStorageThread.h" +#include "StorageThread.h" -#include "LocalStorageTask.h" +#include "StorageTask.h" #include "StorageAreaSync.h" namespace WebCore { -LocalStorageThread::LocalStorageThread() -: m_timer(this, &LocalStorageThread::timerFired) +StorageThread::StorageThread() +: m_timer(this, &StorageThread::timerFired) { } -LocalStorageThread::~LocalStorageThread() +StorageThread::~StorageThread() { } -bool LocalStorageThread::start() +bool StorageThread::start() { return true; } -void LocalStorageThread::timerFired(Timer*) +void StorageThread::timerFired(Timer*) { if (!m_queue.isEmpty()) { - RefPtr task = m_queue.first(); + RefPtr task = m_queue.first(); task->performTask(); m_queue.removeFirst(); if (!m_queue.isEmpty()) @@ -54,27 +54,27 @@ void LocalStorageThread::timerFired(Timer*) } } -void LocalStorageThread::scheduleImport(PassRefPtr area) +void StorageThread::scheduleImport(PassRefPtr area) { - m_queue.append(LocalStorageTask::createImport(area)); + m_queue.append(StorageTask::createImport(area)); if (!m_timer.isActive()) m_timer.startOneShot(0); } -void LocalStorageThread::scheduleSync(PassRefPtr area) +void StorageThread::scheduleSync(PassRefPtr area) { - m_queue.append(LocalStorageTask::createSync(area)); + m_queue.append(StorageTask::createSync(area)); if (!m_timer.isActive()) m_timer.startOneShot(0); } -void LocalStorageThread::terminate() +void StorageThread::terminate() { m_queue.clear(); m_timer.stop(); } -void LocalStorageThread::performTerminate() +void StorageThread::performTerminate() { m_queue.clear(); m_timer.stop(); diff --git a/Source/WebCore/storage/wince/LocalStorageThreadWinCE.h b/Source/WebCore/storage/wince/StorageThreadWinCE.h similarity index 74% rename from Source/WebCore/storage/wince/LocalStorageThreadWinCE.h rename to Source/WebCore/storage/wince/StorageThreadWinCE.h index 06e7d45..67573ae 100644 --- a/Source/WebCore/storage/wince/LocalStorageThreadWinCE.h +++ b/Source/WebCore/storage/wince/StorageThreadWinCE.h @@ -22,8 +22,8 @@ */ -#ifndef LocalStorageThreadWinCE_h -#define LocalStorageThreadWinCE_h +#ifndef StorageThreadWinCE_h +#define StorageThreadWinCE_h #include #include @@ -31,13 +31,13 @@ namespace WebCore { class StorageAreaSync; - class LocalStorageTask; + class StorageTask; - class LocalStorageThread : public RefCounted { + class StorageThread : public RefCounted { public: - static PassRefPtr create() { return adoptRef(new LocalStorageThread); } + static PassRefPtr create() { return adoptRef(new StorageThread); } - ~LocalStorageThread(); + ~StorageThread(); bool start(); void scheduleImport(PassRefPtr); void scheduleSync(PassRefPtr); @@ -45,14 +45,14 @@ namespace WebCore { void performTerminate(); private: - LocalStorageThread(); + StorageThread(); - void timerFired(Timer*); + void timerFired(Timer*); - Deque > m_queue; - Timer m_timer; + Deque > m_queue; + Timer m_timer; }; } // namespace WebCore -#endif // LocalStorageThreadWinCE_h +#endif // StorageThreadWinCE_h -- 2.7.4