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
+2012-02-24 Huang Dongsung <luxtella@company100.net>
+
+ 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 <pfeldman@chromium.org>
Web Inspector: prepare border images on timelines to enable zooming.
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 \
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 \
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 \
'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',
'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',
__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
__ZN7WebCore4PageC1ERNS0_11PageClientsE
__ZN3WTF6VectorINS_6StringELm0EEaSERKS2_
__ZN7WebCore4PageC2ERNS0_11PageClientsE
-__ZN7WebCore16LocalStorageTaskD1Ev
+__ZN7WebCore11StorageTaskD1Ev
__ZN7WebCore6ChromeC1EPNS_4PageEPNS_12ChromeClientE
__ZN7WebCore19DragCaretControllerC1Ev
__ZN7WebCore14DragControllerC1EPNS_4PageEPNS_10DragClientE
__ZN7WebCore17encodeForFileNameERKN3WTF6StringE
__ZN7WebCore15StorageAreaSync6createEN3WTF10PassRefPtrINS_18StorageSyncManagerEEENS2_INS_15StorageAreaImplEEERKNS1_6StringE
__ZN7WebCore18StorageSyncManager14scheduleImportEN3WTF10PassRefPtrINS_15StorageAreaSyncEEE
-__ZN7WebCore16LocalStorageTaskC1ENS0_4TypeEPNS_15StorageAreaSyncE
+__ZN7WebCore11StorageTaskC1ENS0_4TypeEPNS_15StorageAreaSyncE
__ZN7WebCore15StorageAreaSync13performImportEv
__ZN7WebCore15StorageAreaSync12openDatabaseENS0_21OpenDatabaseParamTypeE
__ZN7WebCore18StorageSyncManager20fullDatabaseFilenameERKN3WTF6StringE
__ZN7WebCore15StorageAreaSync4syncEbRKN3WTF7HashMapINS1_6StringES3_NS1_10StringHashENS1_10HashTraitsIS3_EES6_EE
__ZN7WebCore14StorageTracker20cancelDeletingOriginERKN3WTF6StringE
__ZN7WebCore14StorageTracker16setOriginDetailsERKN3WTF6StringES4_
-__ZN7WebCore16LocalStorageTaskC1ENS0_4TypeERKN3WTF6StringES5_
+__ZN7WebCore11StorageTaskC1ENS0_4TypeERKN3WTF6StringES5_
__ZN7WebCore14StorageTracker12scheduleTaskEPv
__ZN7WebCore14StorageTracker20syncSetOriginDetailsERKN3WTF6StringES4_
__ZN7WebCore26setJSDOMWindowOnhashchangeEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE
__ZN7WebCore15StorageAreaSync17scheduleFinalSyncEv
__ZN7WebCore18StorageSyncManager27scheduleDeleteEmptyDatabaseEN3WTF10PassRefPtrINS_15StorageAreaSyncEEE
__ZN7WebCore18StorageSyncManager5closeEv
-__ZN7WebCore18LocalStorageThread9terminateEv
-__ZN7WebCore16LocalStorageTaskC1ENS0_4TypeEPNS_18LocalStorageThreadE
+__ZN7WebCore13StorageThread9terminateEv
+__ZN7WebCore11StorageTaskC1ENS0_4TypeEPNS_13StorageThreadE
__ZN7WebCore15StorageAreaSync19deleteEmptyDatabaseEv
-__ZN7WebCore18LocalStorageThread16performTerminateEv
-__ZN7WebCore18LocalStorageThreadD1Ev
-__ZN3WTF12MessageQueueIN7WebCore16LocalStorageTaskEED1Ev
+__ZN7WebCore13StorageThread16performTerminateEv
+__ZN7WebCore13StorageThreadD1Ev
+__ZN3WTF12MessageQueueIN7WebCore11StorageTaskEED1Ev
__ZN7WebCore28InspectorFrontendClientLocalD2Ev
__ZN7WebCore21InspectorFrontendHost16disconnectClientEv
__ZN7WebCore23JSInspectorFrontendHostD1Ev
__ZN7WebCore9PageGroup26clearLocalStorageForOriginEPNS_14SecurityOriginE
__ZN7WebCore20StorageNamespaceImpl22clearOriginForDeletionEPNS_14SecurityOriginE
__ZNK3WTF7HashMapINS_6RefPtrIN7WebCore14SecurityOriginEEENS1_INS2_15StorageAreaImplEEENS2_18SecurityOriginHashENS_10HashTraitsIS4_EENS8_IS6_EEE3getEPS3_
-__ZN7WebCore16LocalStorageTaskC1ENS0_4TypeERKN3WTF6StringE
+__ZN7WebCore11StorageTaskC1ENS0_4TypeERKN3WTF6StringE
__ZN7WebCore14StorageTracker16syncDeleteOriginERKN3WTF6StringE
__ZN7WebCore14StorageTracker21databasePathForOriginERKN3WTF6StringE
__ZN7WebCore14StorageTracker18diskUsageForOriginEPNS_14SecurityOriginE
>
</File>
<File
- RelativePath="..\storage\LocalStorageTask.cpp"
+ RelativePath="..\storage\StorageTask.cpp"
>
</File>
<File
- RelativePath="..\storage\LocalStorageTask.h"
+ RelativePath="..\storage\StorageTask.h"
>
</File>
<File
- RelativePath="..\storage\LocalStorageThread.cpp"
+ RelativePath="..\storage\StorageThread.cpp"
>
</File>
<File
- RelativePath="..\storage\LocalStorageThread.h"
+ RelativePath="..\storage\StorageThread.h"
>
</File>
<File
5112247810CFB8F4008099D7 /* WorkerThreadableWebSocketChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5112247710CFB8F4008099D7 /* WorkerThreadableWebSocketChannel.cpp */; };
5112247A10CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 5112247910CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h */; };
5116D9770CF177BD00C2B84D /* DatabaseDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = 5116D9750CF177BD00C2B84D /* DatabaseDetails.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 511F23170DC160DA004F0032 /* LocalStorageTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511F23130DC160DA004F0032 /* LocalStorageTask.cpp */; };
- 511F23180DC160DA004F0032 /* LocalStorageTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F23140DC160DA004F0032 /* LocalStorageTask.h */; };
- 511F23190DC160DA004F0032 /* LocalStorageThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511F23150DC160DA004F0032 /* LocalStorageThread.cpp */; };
- 511F231A0DC160DA004F0032 /* LocalStorageThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F23160DC160DA004F0032 /* LocalStorageThread.h */; };
+ 511F23170DC160DA004F0032 /* StorageTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511F23130DC160DA004F0032 /* StorageTask.cpp */; };
+ 511F23180DC160DA004F0032 /* StorageTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F23140DC160DA004F0032 /* StorageTask.h */; };
+ 511F23190DC160DA004F0032 /* StorageThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511F23150DC160DA004F0032 /* StorageThread.cpp */; };
+ 511F231A0DC160DA004F0032 /* StorageThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F23160DC160DA004F0032 /* StorageThread.h */; };
5126E6BB0A2E3B12005C29FA /* IconDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5126E6B90A2E3B12005C29FA /* IconDatabase.cpp */; };
5126E6BC0A2E3B12005C29FA /* IconDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 5126E6BA0A2E3B12005C29FA /* IconDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
512DD8E30D91E2B4000F89EE /* SharedBufferCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512DD8E20D91E2B4000F89EE /* SharedBufferCF.cpp */; };
5112247710CFB8F4008099D7 /* WorkerThreadableWebSocketChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerThreadableWebSocketChannel.cpp; sourceTree = "<group>"; };
5112247910CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerThreadableWebSocketChannel.h; sourceTree = "<group>"; };
5116D9750CF177BD00C2B84D /* DatabaseDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseDetails.h; sourceTree = "<group>"; };
- 511F23130DC160DA004F0032 /* LocalStorageTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageTask.cpp; sourceTree = "<group>"; };
- 511F23140DC160DA004F0032 /* LocalStorageTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageTask.h; sourceTree = "<group>"; };
- 511F23150DC160DA004F0032 /* LocalStorageThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageThread.cpp; sourceTree = "<group>"; };
- 511F23160DC160DA004F0032 /* LocalStorageThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageThread.h; sourceTree = "<group>"; };
+ 511F23130DC160DA004F0032 /* StorageTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageTask.cpp; sourceTree = "<group>"; };
+ 511F23140DC160DA004F0032 /* StorageTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageTask.h; sourceTree = "<group>"; };
+ 511F23150DC160DA004F0032 /* StorageThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageThread.cpp; sourceTree = "<group>"; };
+ 511F23160DC160DA004F0032 /* StorageThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageThread.h; sourceTree = "<group>"; };
5126E6B90A2E3B12005C29FA /* IconDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = IconDatabase.cpp; sourceTree = "<group>"; };
5126E6BA0A2E3B12005C29FA /* IconDatabase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IconDatabase.h; sourceTree = "<group>"; };
512DD8E20D91E2B4000F89EE /* SharedBufferCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedBufferCF.cpp; sourceTree = "<group>"; };
B6566268120B115A006EA85C /* IDBTransaction.h */,
B6566269120B115A006EA85C /* IDBTransaction.idl */,
B656626D120B116B006EA85C /* IDBTransactionBackendInterface.h */,
- 511F23130DC160DA004F0032 /* LocalStorageTask.cpp */,
- 511F23140DC160DA004F0032 /* LocalStorageTask.h */,
- 511F23150DC160DA004F0032 /* LocalStorageThread.cpp */,
- 511F23160DC160DA004F0032 /* LocalStorageThread.h */,
+ 511F23130DC160DA004F0032 /* StorageTask.cpp */,
+ 511F23140DC160DA004F0032 /* StorageTask.h */,
+ 511F23150DC160DA004F0032 /* StorageThread.cpp */,
+ 511F23160DC160DA004F0032 /* StorageThread.h */,
51A926780D53F0570063ECC2 /* OriginQuotaManager.cpp */,
51A926790D53F0570063ECC2 /* OriginQuotaManager.h */,
51A9267A0D53F0570063ECC2 /* OriginUsageRecord.cpp */,
A5732B0D136A16C4005C8D7C /* LocalizedDate.h in Headers */,
F5142C69123F12B000F5BD4C /* LocalizedNumber.h in Headers */,
935207BE09BD410A00F2038D /* LocalizedStrings.h in Headers */,
- 511F23180DC160DA004F0032 /* LocalStorageTask.h in Headers */,
- 511F231A0DC160DA004F0032 /* LocalStorageThread.h in Headers */,
+ 511F23180DC160DA004F0032 /* StorageTask.h in Headers */,
+ 511F231A0DC160DA004F0032 /* StorageThread.h in Headers */,
BCE1C41B0D982980003B02F2 /* Location.h in Headers */,
A8239E0109B3CF8A00B60641 /* Logging.h in Headers */,
FD31603912B0267600C1A359 /* LowPass2FilterNode.h in Headers */,
F5CC42DC12F801CA00D5F7E3 /* LocalizedNumberMac.mm in Sources */,
C046E1AC1208A9FE00BA2CF7 /* LocalizedStrings.cpp in Sources */,
BC25B52A131C6D3900180E10 /* LocalizedStringsMac.mm in Sources */,
- 511F23170DC160DA004F0032 /* LocalStorageTask.cpp in Sources */,
- 511F23190DC160DA004F0032 /* LocalStorageThread.cpp in Sources */,
+ 511F23170DC160DA004F0032 /* StorageTask.cpp in Sources */,
+ 511F23190DC160DA004F0032 /* StorageThread.cpp in Sources */,
BCE1C41C0D982981003B02F2 /* Location.cpp in Sources */,
A8239E0009B3CF8A00B60641 /* Logging.cpp in Sources */,
1402645E0AFDC19B005919E2 /* LoggingMac.mm in Sources */,
+++ /dev/null
-/*
- * 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 LocalStorageTask_h
-#define LocalStorageTask_h
-
-#include "PlatformString.h"
-#include <wtf/PassOwnPtr.h>
-#include <wtf/Threading.h>
-
-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<LocalStorageTask> createImport(StorageAreaSync* area) { return adoptPtr(new LocalStorageTask(AreaImport, area)); }
- static PassOwnPtr<LocalStorageTask> createSync(StorageAreaSync* area) { return adoptPtr(new LocalStorageTask(AreaSync, area)); }
- static PassOwnPtr<LocalStorageTask> createDeleteEmptyDatabase(StorageAreaSync* area) { return adoptPtr(new LocalStorageTask(DeleteEmptyDatabase, area)); }
- static PassOwnPtr<LocalStorageTask> createOriginIdentifiersImport() { return adoptPtr(new LocalStorageTask(ImportOrigins)); }
- static PassOwnPtr<LocalStorageTask> createSetOriginDetails(const String& originIdentifier, const String& databaseFilename) { return adoptPtr(new LocalStorageTask(SetOriginDetails, originIdentifier, databaseFilename)); }
- static PassOwnPtr<LocalStorageTask> createDeleteOrigin(const String& originIdentifier) { return adoptPtr(new LocalStorageTask(DeleteOrigin, originIdentifier)); }
- static PassOwnPtr<LocalStorageTask> createDeleteAllOrigins() { return adoptPtr(new LocalStorageTask(DeleteAllOrigins)); }
- static PassOwnPtr<LocalStorageTask> 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
#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"
}
StorageSyncManager::StorageSyncManager(const String& path)
- : m_thread(LocalStorageThread::create())
+ : m_thread(StorageThread::create())
, m_path(path.isolatedCopy())
{
ASSERT(isMainThread());
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;
}
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<StorageAreaSync> area)
ASSERT(isMainThread());
ASSERT(m_thread);
if (m_thread)
- m_thread->scheduleTask(LocalStorageTask::createDeleteEmptyDatabase(area.get()));
+ m_thread->scheduleTask(StorageTask::createDeleteEmptyDatabase(area.get()));
}
} // namespace WebCore
namespace WebCore {
- class LocalStorageThread;
+ class StorageThread;
class SecurityOrigin;
class StorageAreaSync;
private:
StorageSyncManager(const String& path);
- OwnPtr<LocalStorageThread> m_thread;
+ OwnPtr<StorageThread> m_thread;
// The following members are subject to thread synchronization issues
public:
*/
#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)
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)
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)
ASSERT(m_type == SetOriginDetails);
}
-LocalStorageTask::~LocalStorageTask()
+StorageTask::~StorageTask()
{
}
-void LocalStorageTask::performTask()
+void StorageTask::performTask()
{
switch (m_type) {
case AreaImport:
--- /dev/null
+/*
+ * 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 <wtf/PassOwnPtr.h>
+#include <wtf/Threading.h>
+
+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<StorageTask> createImport(StorageAreaSync* area) { return adoptPtr(new StorageTask(AreaImport, area)); }
+ static PassOwnPtr<StorageTask> createSync(StorageAreaSync* area) { return adoptPtr(new StorageTask(AreaSync, area)); }
+ static PassOwnPtr<StorageTask> createDeleteEmptyDatabase(StorageAreaSync* area) { return adoptPtr(new StorageTask(DeleteEmptyDatabase, area)); }
+ static PassOwnPtr<StorageTask> createOriginIdentifiersImport() { return adoptPtr(new StorageTask(ImportOrigins)); }
+ static PassOwnPtr<StorageTask> createSetOriginDetails(const String& originIdentifier, const String& databaseFilename) { return adoptPtr(new StorageTask(SetOriginDetails, originIdentifier, databaseFilename)); }
+ static PassOwnPtr<StorageTask> createDeleteOrigin(const String& originIdentifier) { return adoptPtr(new StorageTask(DeleteOrigin, originIdentifier)); }
+ static PassOwnPtr<StorageTask> createDeleteAllOrigins() { return adoptPtr(new StorageTask(DeleteAllOrigins)); }
+ static PassOwnPtr<StorageTask> 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
*/
#include "config.h"
-#include "LocalStorageThread.h"
+#include "StorageThread.h"
-#include "LocalStorageTask.h"
+#include "StorageTask.h"
#include "StorageAreaSync.h"
#include <wtf/MainThread.h>
namespace WebCore {
-PassOwnPtr<LocalStorageThread> LocalStorageThread::create()
+PassOwnPtr<StorageThread> 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<LocalStorageThread*>(thread)->threadEntryPoint();
+ static_cast<StorageThread*>(thread)->threadEntryPoint();
}
-void LocalStorageThread::threadEntryPoint()
+void StorageThread::threadEntryPoint()
{
ASSERT(!isMainThread());
- while (OwnPtr<LocalStorageTask> task = m_queue.waitForMessage())
+ while (OwnPtr<StorageTask> task = m_queue.waitForMessage())
task->performTask();
}
-void LocalStorageThread::scheduleTask(PassOwnPtr<LocalStorageTask> task)
+void StorageThread::scheduleTask(PassOwnPtr<StorageTask> 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);
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();
* 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 <wtf/HashSet.h>
#include <wtf/MessageQueue.h>
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<LocalStorageThread> create();
- ~LocalStorageThread();
+ static PassOwnPtr<StorageThread> create();
+ ~StorageThread();
bool start();
void terminate();
- void scheduleTask(PassOwnPtr<LocalStorageTask>);
+ void scheduleTask(PassOwnPtr<StorageTask>);
// 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<LocalStorageTask> m_queue;
+ MessageQueue<StorageTask> m_queue;
};
} // namespace WebCore
-#endif // LocalStorageThread_h
+#endif // StorageThread_h
#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"
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)
ASSERT(isMainThread());
ASSERT(m_thread);
- m_thread->scheduleTask(LocalStorageTask::createOriginIdentifiersImport());
+ m_thread->scheduleTask(StorageTask::createOriginIdentifiersImport());
}
void StorageTracker::notifyFinishedImportingOriginIdentifiersOnMainThread(void*)
m_originSet.add(originIdentifier);
}
- OwnPtr<LocalStorageTask> task = LocalStorageTask::createSetOriginDetails(originIdentifier.isolatedCopy(), databaseFile);
+ OwnPtr<StorageTask> task = StorageTask::createSetOriginDetails(originIdentifier.isolatedCopy(), databaseFile);
if (isMainThread()) {
ASSERT(m_thread);
ASSERT(isMainThread());
ASSERT(StorageTracker::tracker().m_thread);
- OwnPtr<LocalStorageTask> task = adoptPtr(reinterpret_cast<LocalStorageTask*>(taskIn));
+ OwnPtr<StorageTask> task = adoptPtr(reinterpret_cast<StorageTask*>(taskIn));
StorageTracker::tracker().m_thread->scheduleTask(task.release());
}
PageGroup::clearLocalStorageForAllOrigins();
- m_thread->scheduleTask(LocalStorageTask::createDeleteAllOrigins());
+ m_thread->scheduleTask(StorageTask::createDeleteAllOrigins());
}
void StorageTracker::syncDeleteAllOrigins()
m_originSet.remove(originId);
}
- m_thread->scheduleTask(LocalStorageTask::createDeleteOrigin(originId));
+ m_thread->scheduleTask(StorageTask::createDeleteOrigin(originId));
}
void StorageTracker::syncDeleteOrigin(const String& originIdentifier)
namespace WebCore {
-class LocalStorageTask;
-class LocalStorageThread;
+class StorageTask;
+class StorageThread;
class SecurityOrigin;
class StorageTrackerClient;
OriginSet m_originSet;
OriginSet m_originsBeingDeleted;
- OwnPtr<LocalStorageThread> m_thread;
+ OwnPtr<StorageThread> m_thread;
bool m_isActive;
bool m_needsInitialization;
*/
#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<LocalStorageThread>*)
+void StorageThread::timerFired(Timer<StorageThread>*)
{
if (!m_queue.isEmpty()) {
- RefPtr<LocalStorageTask> task = m_queue.first();
+ RefPtr<StorageTask> task = m_queue.first();
task->performTask();
m_queue.removeFirst();
if (!m_queue.isEmpty())
}
}
-void LocalStorageThread::scheduleImport(PassRefPtr<StorageAreaSync> area)
+void StorageThread::scheduleImport(PassRefPtr<StorageAreaSync> 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<StorageAreaSync> area)
+void StorageThread::scheduleSync(PassRefPtr<StorageAreaSync> 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();
*/
-#ifndef LocalStorageThreadWinCE_h
-#define LocalStorageThreadWinCE_h
+#ifndef StorageThreadWinCE_h
+#define StorageThreadWinCE_h
#include <wtf/Deque.h>
#include <wtf/PassRefPtr.h>
namespace WebCore {
class StorageAreaSync;
- class LocalStorageTask;
+ class StorageTask;
- class LocalStorageThread : public RefCounted<LocalStorageThread> {
+ class StorageThread : public RefCounted<StorageThread> {
public:
- static PassRefPtr<LocalStorageThread> create() { return adoptRef(new LocalStorageThread); }
+ static PassRefPtr<StorageThread> create() { return adoptRef(new StorageThread); }
- ~LocalStorageThread();
+ ~StorageThread();
bool start();
void scheduleImport(PassRefPtr<StorageAreaSync>);
void scheduleSync(PassRefPtr<StorageAreaSync>);
void performTerminate();
private:
- LocalStorageThread();
+ StorageThread();
- void timerFired(Timer<LocalStorageThread>*);
+ void timerFired(Timer<StorageThread>*);
- Deque<RefPtr<LocalStorageTask> > m_queue;
- Timer<LocalStorageThread> m_timer;
+ Deque<RefPtr<StorageTask> > m_queue;
+ Timer<StorageThread> m_timer;
};
} // namespace WebCore
-#endif // LocalStorageThreadWinCE_h
+#endif // StorageThreadWinCE_h
projects / profile / ivi / webkit-efl.git / commitdiff