Move storage code from WebCore to WebKit
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Dec 2014 21:12:28 +0000 (21:12 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Dec 2014 21:12:28 +0000 (21:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=139558

Reviewed by Darin Adler.

Source/WebCore:

* WebCore.exp.in:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* platform/MemoryPressureHandler.cpp:

Source/WebKit:

* Storage/StorageAreaImpl.cpp: Renamed from Source/WebCore/storage/StorageAreaImpl.cpp.
(WebCore::StorageAreaImpl::~StorageAreaImpl):
(WebCore::StorageAreaImpl::StorageAreaImpl):
(WebCore::StorageAreaImpl::create):
(WebCore::StorageAreaImpl::copy):
(WebCore::StorageAreaImpl::canAccessStorage):
(WebCore::StorageAreaImpl::storageType):
(WebCore::StorageAreaImpl::length):
(WebCore::StorageAreaImpl::key):
(WebCore::StorageAreaImpl::item):
(WebCore::StorageAreaImpl::setItem):
(WebCore::StorageAreaImpl::removeItem):
(WebCore::StorageAreaImpl::clear):
(WebCore::StorageAreaImpl::contains):
(WebCore::StorageAreaImpl::importItems):
(WebCore::StorageAreaImpl::close):
(WebCore::StorageAreaImpl::clearForOriginDeletion):
(WebCore::StorageAreaImpl::sync):
(WebCore::StorageAreaImpl::blockUntilImportComplete):
(WebCore::StorageAreaImpl::memoryBytesUsedByCache):
(WebCore::StorageAreaImpl::incrementAccessCount):
(WebCore::StorageAreaImpl::decrementAccessCount):
(WebCore::StorageAreaImpl::closeDatabaseTimerFired):
(WebCore::StorageAreaImpl::closeDatabaseIfIdle):
(WebCore::StorageAreaImpl::dispatchStorageEvent):
* Storage/StorageAreaImpl.h: Renamed from Source/WebCore/storage/StorageAreaImpl.h.
* Storage/StorageAreaSync.cpp: Renamed from Source/WebCore/storage/StorageAreaSync.cpp.
(WebCore::StorageAreaSync::StorageAreaSync):
(WebCore::StorageAreaSync::create):
(WebCore::StorageAreaSync::~StorageAreaSync):
(WebCore::StorageAreaSync::scheduleFinalSync):
(WebCore::StorageAreaSync::scheduleItemForSync):
(WebCore::StorageAreaSync::scheduleClear):
(WebCore::StorageAreaSync::scheduleCloseDatabase):
(WebCore::StorageAreaSync::syncTimerFired):
(WebCore::StorageAreaSync::openDatabase):
(WebCore::StorageAreaSync::migrateItemTableIfNeeded):
(WebCore::StorageAreaSync::performImport):
(WebCore::StorageAreaSync::markImported):
(WebCore::StorageAreaSync::blockUntilImportComplete):
(WebCore::StorageAreaSync::sync):
(WebCore::StorageAreaSync::performSync):
(WebCore::StorageAreaSync::deleteEmptyDatabase):
(WebCore::StorageAreaSync::scheduleSync):
* Storage/StorageAreaSync.h: Renamed from Source/WebCore/storage/StorageAreaSync.h.
* Storage/StorageNamespaceImpl.cpp: Renamed from Source/WebCore/storage/StorageNamespaceImpl.cpp.
(WebCore::localStorageNamespaceMap):
(WebCore::StorageNamespaceImpl::createSessionStorageNamespace):
(WebCore::StorageNamespaceImpl::getOrCreateLocalStorageNamespace):
(WebCore::StorageNamespaceImpl::StorageNamespaceImpl):
(WebCore::StorageNamespaceImpl::~StorageNamespaceImpl):
(WebCore::StorageNamespaceImpl::copy):
(WebCore::StorageNamespaceImpl::storageArea):
(WebCore::StorageNamespaceImpl::close):
(WebCore::StorageNamespaceImpl::clearOriginForDeletion):
(WebCore::StorageNamespaceImpl::clearAllOriginsForDeletion):
(WebCore::StorageNamespaceImpl::sync):
(WebCore::StorageNamespaceImpl::closeIdleLocalStorageDatabases):
* Storage/StorageNamespaceImpl.h: Renamed from Source/WebCore/storage/StorageNamespaceImpl.h.
* Storage/StorageSyncManager.cpp: Renamed from Source/WebCore/storage/StorageSyncManager.cpp.
(WebCore::StorageSyncManager::create):
(WebCore::StorageSyncManager::StorageSyncManager):
(WebCore::StorageSyncManager::~StorageSyncManager):
(WebCore::StorageSyncManager::fullDatabaseFilename):
(WebCore::StorageSyncManager::dispatch):
(WebCore::StorageSyncManager::close):
* Storage/StorageSyncManager.h: Renamed from Source/WebCore/storage/StorageSyncManager.h.
* Storage/StorageThread.cpp: Renamed from Source/WebCore/storage/StorageThread.cpp.
(WebCore::activeStorageThreads):
(WebCore::StorageThread::StorageThread):
(WebCore::StorageThread::~StorageThread):
(WebCore::StorageThread::start):
(WebCore::StorageThread::threadEntryPointCallback):
(WebCore::StorageThread::threadEntryPoint):
(WebCore::StorageThread::dispatch):
(WebCore::StorageThread::terminate):
(WebCore::StorageThread::performTerminate):
(WebCore::StorageThread::releaseFastMallocFreeMemoryInAllThreads):
* Storage/StorageThread.h: Renamed from Source/WebCore/storage/StorageThread.h.
* Storage/StorageTracker.cpp: Renamed from Source/WebCore/storage/StorageTracker.cpp.
(WebCore::StorageTracker::initializeTracker):
(WebCore::StorageTracker::internalInitialize):
(WebCore::StorageTracker::tracker):
(WebCore::StorageTracker::StorageTracker):
(WebCore::StorageTracker::setDatabaseDirectoryPath):
(WebCore::StorageTracker::databaseDirectoryPath):
(WebCore::StorageTracker::trackerDatabasePath):
(WebCore::ensureDatabaseFileExists):
(WebCore::StorageTracker::openTrackerDatabase):
(WebCore::StorageTracker::importOriginIdentifiers):
(WebCore::StorageTracker::finishedImportingOriginIdentifiers):
(WebCore::StorageTracker::syncImportOriginIdentifiers):
(WebCore::StorageTracker::syncFileSystemAndTrackerDatabase):
(WebCore::StorageTracker::setOriginDetails):
(WebCore::StorageTracker::syncSetOriginDetails):
(WebCore::StorageTracker::origins):
(WebCore::StorageTracker::deleteAllOrigins):
(WebCore::truncateDatabaseFile):
(WebCore::StorageTracker::syncDeleteAllOrigins):
(WebCore::StorageTracker::deleteOriginWithIdentifier):
(WebCore::StorageTracker::deleteOrigin):
(WebCore::StorageTracker::syncDeleteOrigin):
(WebCore::StorageTracker::willDeleteAllOrigins):
(WebCore::StorageTracker::willDeleteOrigin):
(WebCore::StorageTracker::canDeleteOrigin):
(WebCore::StorageTracker::cancelDeletingOrigin):
(WebCore::StorageTracker::isActive):
(WebCore::StorageTracker::setIsActive):
(WebCore::StorageTracker::databasePathForOrigin):
(WebCore::StorageTracker::diskUsageForOrigin):
* Storage/StorageTracker.h: Renamed from Source/WebCore/storage/StorageTracker.h.
(WebCore::StorageTracker::storageDatabaseIdleInterval):
(WebCore::StorageTracker::setStorageDatabaseIdleInterval):
* Storage/StorageTrackerClient.h: Renamed from Source/WebCore/storage/StorageTrackerClient.h.
(WebCore::StorageTrackerClient::~StorageTrackerClient):
* Storage/WebStorageNamespaceProvider.cpp:
* WebKit.vcxproj/WebKit/WebKit.vcxproj:
* WebKit.vcxproj/WebKit/WebKit.vcxproj.filters:
* WebKit.xcodeproj/project.pbxproj:

Source/WebKit/mac:

* Storage/WebStorageManager.mm:
* Storage/WebStorageTrackerClient.h:
* WebView/WebView.mm:

Source/WebKit2:

* WebProcess/WebProcess.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177813 268f45cc-cd09-0410-ab3c-d52691b4dbfc

32 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/MemoryPressureHandler.cpp
Source/WebKit/ChangeLog
Source/WebKit/Storage/StorageAreaImpl.cpp [moved from Source/WebCore/storage/StorageAreaImpl.cpp with 98% similarity]
Source/WebKit/Storage/StorageAreaImpl.h [moved from Source/WebCore/storage/StorageAreaImpl.h with 98% similarity]
Source/WebKit/Storage/StorageAreaSync.cpp [moved from Source/WebCore/storage/StorageAreaSync.cpp with 97% similarity]
Source/WebKit/Storage/StorageAreaSync.h [moved from Source/WebCore/storage/StorageAreaSync.h with 96% similarity]
Source/WebKit/Storage/StorageNamespaceImpl.cpp [moved from Source/WebCore/storage/StorageNamespaceImpl.cpp with 98% similarity]
Source/WebKit/Storage/StorageNamespaceImpl.h [moved from Source/WebCore/storage/StorageNamespaceImpl.h with 96% similarity]
Source/WebKit/Storage/StorageSyncManager.cpp [moved from Source/WebCore/storage/StorageSyncManager.cpp with 98% similarity]
Source/WebKit/Storage/StorageSyncManager.h [moved from Source/WebCore/storage/StorageSyncManager.h with 100% similarity]
Source/WebKit/Storage/StorageThread.cpp [moved from Source/WebCore/storage/StorageThread.cpp with 99% similarity]
Source/WebKit/Storage/StorageThread.h [moved from Source/WebCore/storage/StorageThread.h with 100% similarity]
Source/WebKit/Storage/StorageTracker.cpp [moved from Source/WebCore/storage/StorageTracker.cpp with 98% similarity]
Source/WebKit/Storage/StorageTracker.h [moved from Source/WebCore/storage/StorageTracker.h with 99% similarity]
Source/WebKit/Storage/StorageTrackerClient.h [moved from Source/WebCore/storage/StorageTrackerClient.h with 100% similarity]
Source/WebKit/Storage/WebStorageNamespaceProvider.cpp
Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj
Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters
Source/WebKit/WebKit.xcodeproj/project.pbxproj
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Storage/WebStorageManager.mm
Source/WebKit/mac/Storage/WebStorageManagerInternal.h
Source/WebKit/mac/Storage/WebStorageTrackerClient.h
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebProcess.cpp

index 0824e0a..8e9dd2d 100644 (file)
@@ -2483,16 +2483,10 @@ set(WebCore_SOURCES
     replay/UserInputBridge.cpp
 
     storage/Storage.cpp
-    storage/StorageAreaImpl.cpp
-    storage/StorageAreaSync.cpp
     storage/StorageEvent.cpp
     storage/StorageEventDispatcher.cpp
     storage/StorageMap.cpp
-    storage/StorageNamespaceImpl.cpp
     storage/StorageNamespaceProvider.cpp
-    storage/StorageSyncManager.cpp
-    storage/StorageThread.cpp
-    storage/StorageTracker.cpp
 
     style/InlineTextBoxStyle.cpp
     style/StyleFontSizeFunctions.cpp
index 5ce4a65..74b6b53 100644 (file)
@@ -1,3 +1,16 @@
+2014-12-29  Anders Carlsson  <andersca@apple.com>
+
+        Move storage code from WebCore to WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=139558
+
+        Reviewed by Darin Adler.
+
+        * WebCore.exp.in:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/MemoryPressureHandler.cpp:
+
 2014-12-29  Sebastian Dröge  <sebastian@centricular.com>
 
         [GStreamer] Rewrite MediaSource implementation
index c529e71..88ee125 100644 (file)
@@ -199,6 +199,7 @@ __ZN7WebCore11PageOverlay6createERNS0_6ClientENS0_11OverlayTypeE
 __ZN7WebCore11PageOverlay8setFrameENS_7IntRectE
 __ZN7WebCore11SQLResultOkE
 __ZN7WebCore11URLWithDataEP6NSDataP5NSURL
+__ZN7WebCore11getFileSizeERKN3WTF6StringERx
 __ZN7WebCore11getURLBytesEPK7__CFURLRN3WTF6VectorIcLm512ENS3_15CrashOnOverflowEEE
 __ZN7WebCore11getURLBytesEPK7__CFURLRN3WTF7CStringE
 __ZN7WebCore11iBeamCursorEv
@@ -336,7 +337,6 @@ __ZN7WebCore13ResourceErrorC1EP7NSError
 __ZN7WebCore13ResourceErrorC1EP9__CFError
 __ZN7WebCore13SQLResultDoneE
 __ZN7WebCore13SelectionRectC1ERKNS_7IntRectEbi
-__ZN7WebCore13StorageThread39releaseFastMallocFreeMemoryInAllThreadsEv
 __ZN7WebCore13StyledElement22setInlineStylePropertyENS_13CSSPropertyIDERKN3WTF6StringEb
 __ZN7WebCore13StyledElement22setInlineStylePropertyENS_13CSSPropertyIDEdNS_17CSSPrimitiveValue9UnitTypesEb
 __ZN7WebCore13TextIndicator6createERKNS_17TextIndicatorDataE
@@ -459,13 +459,6 @@ __ZN7WebCore14SecurityPolicy22generateReferrerHeaderENS_14ReferrerPolicyERKNS_3U
 __ZN7WebCore14SecurityPolicy27resetOriginAccessWhitelistsEv
 __ZN7WebCore14SecurityPolicy29addOriginAccessWhitelistEntryERKNS_14SecurityOriginERKN3WTF6StringES7_b
 __ZN7WebCore14SecurityPolicy32removeOriginAccessWhitelistEntryERKNS_14SecurityOriginERKN3WTF6StringES7_b
-__ZN7WebCore14StorageTracker12deleteOriginEPNS_14SecurityOriginE
-__ZN7WebCore14StorageTracker16deleteAllOriginsEv
-__ZN7WebCore14StorageTracker17initializeTrackerERKN3WTF6StringEPNS_20StorageTrackerClientE
-__ZN7WebCore14StorageTracker18diskUsageForOriginEPNS_14SecurityOriginE
-__ZN7WebCore14StorageTracker32syncFileSystemAndTrackerDatabaseEv
-__ZN7WebCore14StorageTracker7originsERN3WTF6VectorINS1_6RefPtrINS_14SecurityOriginEEELm0ENS1_15CrashOnOverflowEEE
-__ZN7WebCore14StorageTracker7trackerEv
 __ZN7WebCore14SubframeLoader12allowPluginsENS_28ReasonForCallingAllowPluginsE
 __ZN7WebCore14TileController14setTilesOpaqueEb
 __ZN7WebCore14TileController15containerLayersEv
@@ -653,6 +646,7 @@ __ZN7WebCore15SQLiteStatement7prepareEv
 __ZN7WebCore15SQLiteStatement8bindBlobEiPKvi
 __ZN7WebCore15SQLiteStatement8bindBlobEiRKN3WTF6StringE
 __ZN7WebCore15SQLiteStatement8bindTextEiRKN3WTF6StringE
+__ZN7WebCore15SQLiteStatement8finalizeEv
 __ZN7WebCore15SQLiteStatement9bindInt64Eix
 __ZN7WebCore15SQLiteStatementC1ERNS_14SQLiteDatabaseERKN3WTF6StringE
 __ZN7WebCore15SQLiteStatementD1Ev
@@ -904,8 +898,6 @@ __ZN7WebCore20ResourceResponseBase24setExpectedContentLengthEx
 __ZN7WebCore20ResourceResponseBase6setURLERKNS_3URLE
 __ZN7WebCore20ResourceResponseBase9setSourceENS0_6SourceE
 __ZN7WebCore20ResourceResponseBaseC2Ev
-__ZN7WebCore20StorageNamespaceImpl29createSessionStorageNamespaceEj
-__ZN7WebCore20StorageNamespaceImpl32getOrCreateLocalStorageNamespaceERKN3WTF6StringEj
 __ZN7WebCore20TransformationMatrix5scaleEd
 __ZN7WebCore20TransformationMatrix9translateEdd
 __ZN7WebCore20UserGestureIndicator7s_stateE
@@ -956,6 +948,8 @@ __ZN7WebCore21ResourceLoadScheduler32notifyDidScheduleResourceRequestEPNS_14Reso
 __ZN7WebCore21ResourceLoadScheduler6removeEPNS_14ResourceLoaderE
 __ZN7WebCore21ResourceLoadSchedulerC2Ev
 __ZN7WebCore21ResourceLoadSchedulerD2Ev
+__ZN7WebCore21SQLiteDatabaseTracker35decrementTransactionInProgressCountEv
+__ZN7WebCore21SQLiteDatabaseTracker35incrementTransactionInProgressCountEv
 __ZN7WebCore21SQLiteDatabaseTracker9setClientEPNS_27SQLiteDatabaseTrackerClientE
 __ZN7WebCore21SerializedScriptValue11deserializeEPK15OpaqueJSContextPPK13OpaqueJSValue
 __ZN7WebCore21SerializedScriptValue11deserializeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectEPN3WTF6VectorINS6_6RefPtrINS_11MessagePortEEELm1ENS6_15CrashOnOverflowEEENS_22SerializationErrorModeE
@@ -1007,6 +1001,8 @@ __ZN7WebCore22PlatformCAAnimationMac6createEP19CAPropertyAnimation
 __ZN7WebCore22RuntimeEnabledFeatures14sharedFeaturesEv
 __ZN7WebCore22ScriptExecutionContext26canSuspendActiveDOMObjectsEv
 __ZN7WebCore22ScriptExecutionContext2vmEv
+__ZN7WebCore22StorageEventDispatcher26dispatchLocalStorageEventsERKN3WTF6StringES4_S4_PNS_14SecurityOriginEPNS_5FrameE
+__ZN7WebCore22StorageEventDispatcher28dispatchSessionStorageEventsERKN3WTF6StringES4_S4_PNS_14SecurityOriginEPNS_5FrameE
 __ZN7WebCore22StorageEventDispatcher34dispatchLocalStorageEventsToFramesERNS_9PageGroupERKN3WTF6VectorINS3_6RefPtrINS_5FrameEEELm0ENS3_15CrashOnOverflowEEERKNS3_6StringESE_SE_SE_PNS_14SecurityOriginE
 __ZN7WebCore22URLByCanonicalizingURLEP5NSURL
 __ZN7WebCore22URLWithUserTypedStringEP8NSStringP5NSURL
@@ -1564,6 +1560,8 @@ __ZN7WebCore9PageCache33markPagesForVistedLinkStyleRecalcEv
 __ZN7WebCore9PageCache6removeEPNS_11HistoryItemE
 __ZN7WebCore9PageGroup16syncLocalStorageEv
 __ZN7WebCore9PageGroup17closeLocalStorageEv
+__ZN7WebCore9PageGroup26clearLocalStorageForOriginEPNS_14SecurityOriginE
+__ZN7WebCore9PageGroup30clearLocalStorageForAllOriginsEv
 __ZN7WebCore9PageGroup30closeIdleLocalStorageDatabasesEv
 __ZN7WebCore9PageGroup9pageGroupERKN3WTF6StringE
 __ZN7WebCore9Scrollbar11mouseExitedEv
index 9164375..208687a 100644 (file)
     <ClCompile Include="..\history\HistoryItem.cpp" />
     <ClCompile Include="..\history\PageCache.cpp" />
     <ClCompile Include="..\storage\Storage.cpp" />
-    <ClCompile Include="..\storage\StorageAreaImpl.cpp" />
-    <ClCompile Include="..\storage\StorageAreaSync.cpp" />
     <ClCompile Include="..\storage\StorageEvent.cpp" />
     <ClCompile Include="..\storage\StorageEventDispatcher.cpp" />
     <ClCompile Include="..\storage\StorageMap.cpp" />
-    <ClCompile Include="..\storage\StorageNamespaceImpl.cpp" />
     <ClCompile Include="..\storage\StorageNamespaceProvider.cpp" />
-    <ClCompile Include="..\storage\StorageSyncManager.cpp" />
-    <ClCompile Include="..\storage\StorageThread.cpp" />
-    <ClCompile Include="..\storage\StorageTracker.cpp" />
     <ClCompile Include="..\style\InlineTextBoxStyle.cpp" />
     <ClCompile Include="..\style\StyleFontSizeFunctions.cpp" />
     <ClCompile Include="..\style\StyleResolveForDocument.cpp" />
     <ClInclude Include="..\history\PageCache.h" />
     <ClInclude Include="..\storage\Storage.h" />
     <ClInclude Include="..\storage\StorageArea.h" />
-    <ClInclude Include="..\storage\StorageAreaImpl.h" />
-    <ClInclude Include="..\storage\StorageAreaSync.h" />
     <ClInclude Include="..\storage\StorageEvent.h" />
     <ClInclude Include="..\storage\StorageEventDispatcher.h" />
     <ClInclude Include="..\storage\StorageMap.h" />
     <ClInclude Include="..\storage\StorageNamespace.h" />
-    <ClInclude Include="..\storage\StorageNamespaceImpl.h" />
     <ClInclude Include="..\storage\StorageNamespaceProvider.h" />
-    <ClInclude Include="..\storage\StorageSyncManager.h" />
-    <ClInclude Include="..\storage\StorageThread.h" />
-    <ClInclude Include="..\storage\StorageTracker.h" />
     <ClInclude Include="..\style\InlineTextBoxStyle.h" />
     <ClInclude Include="..\style\StyleFontSizeFunctions.h" />
     <ClInclude Include="..\style\StyleResolveForDocument.h" />
index 3a94425..b1af217 100644 (file)
     <ClCompile Include="..\storage\Storage.cpp">
       <Filter>storage</Filter>
     </ClCompile>
-    <ClCompile Include="..\storage\StorageAreaImpl.cpp">
-      <Filter>storage</Filter>
-    </ClCompile>
-    <ClCompile Include="..\storage\StorageAreaSync.cpp">
-      <Filter>storage</Filter>
-    </ClCompile>
     <ClCompile Include="..\storage\StorageEvent.cpp">
       <Filter>storage</Filter>
     </ClCompile>
     <ClCompile Include="..\storage\StorageMap.cpp">
       <Filter>storage</Filter>
     </ClCompile>
-    <ClCompile Include="..\storage\StorageNamespaceImpl.cpp">
-      <Filter>storage</Filter>
-    </ClCompile>
     <ClCompile Include="..\storage\StorageNamespaceProvider.cpp">
       <Filter>storage</Filter>
     </ClCompile>
-    <ClCompile Include="..\storage\StorageSyncManager.cpp">
-      <Filter>storage</Filter>
-    </ClCompile>
-    <ClCompile Include="..\storage\StorageThread.cpp">
-      <Filter>storage</Filter>
-    </ClCompile>
-    <ClCompile Include="..\storage\StorageTracker.cpp">
-      <Filter>storage</Filter>
-    </ClCompile>
     <ClCompile Include="..\bridge\jsc\BridgeJSC.cpp">
       <Filter>bridge</Filter>
     </ClCompile>
     <ClInclude Include="..\storage\StorageArea.h">
       <Filter>storage</Filter>
     </ClInclude>
-    <ClInclude Include="..\storage\StorageAreaImpl.h">
-      <Filter>storage</Filter>
-    </ClInclude>
-    <ClInclude Include="..\storage\StorageAreaSync.h">
-      <Filter>storage</Filter>
-    </ClInclude>
     <ClInclude Include="..\storage\StorageEvent.h">
       <Filter>storage</Filter>
     </ClInclude>
     <ClInclude Include="..\storage\StorageNamespace.h">
       <Filter>storage</Filter>
     </ClInclude>
-    <ClInclude Include="..\storage\StorageNamespaceImpl.h">
-      <Filter>storage</Filter>
-    </ClInclude>
-    <ClInclude Include="..\storage\StorageSyncManager.h">
-      <Filter>storage</Filter>
-    </ClInclude>
-    <ClInclude Include="..\storage\StorageThread.h">
-      <Filter>storage</Filter>
-    </ClInclude>
-    <ClInclude Include="..\storage\StorageTracker.h">
-      <Filter>storage</Filter>
-    </ClInclude>
     <ClInclude Include="..\bridge\Bridge.h">
       <Filter>bridge</Filter>
     </ClInclude>
index 71ad6dd..9ff9fde 100644 (file)
                37F818FD0D657606005E1F05 /* WebCoreURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 37F818FB0D657606005E1F05 /* WebCoreURLResponse.h */; settings = {ATTRIBUTES = (Private, ); }; };
                37F818FE0D657606005E1F05 /* WebCoreURLResponse.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37F818FC0D657606005E1F05 /* WebCoreURLResponse.mm */; };
                37FD4298118368460093C029 /* TreeDepthLimit.h in Headers */ = {isa = PBXBuildFile; fileRef = 37FD4297118368460093C029 /* TreeDepthLimit.h */; };
-               3AB02D2A12D4F91600FBB694 /* StorageTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AB02D2812D4F91600FBB694 /* StorageTracker.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               3AB02D2B12D4F91600FBB694 /* StorageTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3AB02D2912D4F91600FBB694 /* StorageTracker.cpp */; };
-               3AC3680012EF7A09006A3D6F /* StorageTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AC367FE12EF7A09006A3D6F /* StorageTrackerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                3AC648B2129E146500C3EB25 /* EditingBoundary.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AC648B1129E146500C3EB25 /* EditingBoundary.h */; settings = {ATTRIBUTES = (Private, ); }; };
                3C244FEAA375AC633F88BE6F /* RenderLayerModelObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C244FE4A375AC633F88BE6F /* RenderLayerModelObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                3C244FEBA375AC633F88BE6F /* RenderLayerModelObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C244FE5A375AC633F88BE6F /* RenderLayerModelObject.cpp */; };
                511EF2CF17F0FDF100E4FA16 /* JSIDBAnyCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EF2CC17F0FDF100E4FA16 /* JSIDBAnyCustom.cpp */; };
                511EF2D017F0FDF100E4FA16 /* JSIDBDatabaseCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EF2CD17F0FDF100E4FA16 /* JSIDBDatabaseCustom.cpp */; };
                511EF2D117F0FDF100E4FA16 /* JSIDBObjectStoreCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EF2CE17F0FDF100E4FA16 /* JSIDBObjectStoreCustom.cpp */; };
-               511F23190DC160DA004F0032 /* StorageThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511F23150DC160DA004F0032 /* StorageThread.cpp */; };
-               511F231A0DC160DA004F0032 /* StorageThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F23160DC160DA004F0032 /* StorageThread.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5123AF181890A4CA0031CDC9 /* IDBKeyRangeData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5123AF161890A4CA0031CDC9 /* IDBKeyRangeData.cpp */; };
                5123AF191890A4CA0031CDC9 /* IDBKeyRangeData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5123AF171890A4CA0031CDC9 /* IDBKeyRangeData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5123AF1D18918AE40031CDC9 /* IDBGetResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 5123AF1C18918AE40031CDC9 /* IDBGetResult.h */; settings = {ATTRIBUTES = (Private, ); }; };
                C50B561612119D23008B46E0 /* GroupSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50B561412119D23008B46E0 /* GroupSettings.cpp */; };
                C50B561712119D23008B46E0 /* GroupSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = C50B561512119D23008B46E0 /* GroupSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
                C50D0E830FF4272900AC2644 /* StorageNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = C50D0E810FF4272900AC2644 /* StorageNamespace.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               C5102D940FD9AA2D00FAFF04 /* StorageSyncManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C5102D920FD9AA2D00FAFF04 /* StorageSyncManager.h */; };
-               C5102D950FD9AA2D00FAFF04 /* StorageSyncManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5102D930FD9AA2D00FAFF04 /* StorageSyncManager.cpp */; };
-               C5102ECF0FD9EF8C00FAFF04 /* StorageAreaSync.h in Headers */ = {isa = PBXBuildFile; fileRef = C5102ECD0FD9EF8C00FAFF04 /* StorageAreaSync.h */; };
-               C5102ED00FD9EF8C00FAFF04 /* StorageAreaSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5102ECE0FD9EF8C00FAFF04 /* StorageAreaSync.cpp */; };
                C5137CF211A58378004ADB99 /* JSDOMStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5137CF011A58378004ADB99 /* JSDOMStringList.cpp */; };
                C5137CF311A58378004ADB99 /* JSDOMStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = C5137CF111A58378004ADB99 /* JSDOMStringList.h */; };
-               C5160EEA1004543A00A7CEE2 /* StorageAreaImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5160EE81004543A00A7CEE2 /* StorageAreaImpl.cpp */; };
-               C5160EEB1004543A00A7CEE2 /* StorageAreaImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C5160EE91004543A00A7CEE2 /* StorageAreaImpl.h */; };
                C5278B0C17F212EA003A2998 /* PlatformPasteboardIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5278B0B17F212EA003A2998 /* PlatformPasteboardIOS.mm */; };
                C544274B11A57E7A0063A749 /* DOMStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = C544274911A57E7A0063A749 /* DOMStringList.h */; settings = {ATTRIBUTES = (Private, ); }; };
                C55610F111A704EB00B82D27 /* DOMStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C55610F011A704EB00B82D27 /* DOMStringList.cpp */; };
                C55C7BA11718AFBA001327E4 /* RenderThemeIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = C55C7BA01718AFBA001327E4 /* RenderThemeIOS.mm */; };
-               C55E38BF10040D5D00A56BDB /* StorageNamespaceImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C55E38BB10040D5D00A56BDB /* StorageNamespaceImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               C55E38C010040D5D00A56BDB /* StorageNamespaceImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C55E38BC10040D5D00A56BDB /* StorageNamespaceImpl.cpp */; };
                C572EE1F1201C9BC007D8F82 /* JSIDBIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = C572EE1D1201C9BC007D8F82 /* JSIDBIndex.h */; };
                C57FEDE11212EE9C0097BE65 /* FileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C57FEDE01212EE9C0097BE65 /* FileSystem.cpp */; };
                C58361A91744523F00173511 /* FontServicesIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = C58361A71744523F00173511 /* FontServicesIOS.h */; };
                37F818FC0D657606005E1F05 /* WebCoreURLResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreURLResponse.mm; sourceTree = "<group>"; };
                37FC96DA1104ED71003E1FAD /* TrailingFloatsRootInlineBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrailingFloatsRootInlineBox.h; sourceTree = "<group>"; };
                37FD4297118368460093C029 /* TreeDepthLimit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeDepthLimit.h; sourceTree = "<group>"; };
-               3AB02D2812D4F91600FBB694 /* StorageTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageTracker.h; sourceTree = "<group>"; };
-               3AB02D2912D4F91600FBB694 /* StorageTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageTracker.cpp; sourceTree = "<group>"; };
-               3AC367FE12EF7A09006A3D6F /* StorageTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageTrackerClient.h; sourceTree = "<group>"; };
                3AC648B1129E146500C3EB25 /* EditingBoundary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBoundary.h; sourceTree = "<group>"; };
                3C244FE4A375AC633F88BE6F /* RenderLayerModelObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderLayerModelObject.h; sourceTree = "<group>"; };
                3C244FE5A375AC633F88BE6F /* RenderLayerModelObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayerModelObject.cpp; sourceTree = "<group>"; };
                511EF2CC17F0FDF100E4FA16 /* JSIDBAnyCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBAnyCustom.cpp; sourceTree = "<group>"; };
                511EF2CD17F0FDF100E4FA16 /* JSIDBDatabaseCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBDatabaseCustom.cpp; sourceTree = "<group>"; };
                511EF2CE17F0FDF100E4FA16 /* JSIDBObjectStoreCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBObjectStoreCustom.cpp; 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>"; };
                5123AF161890A4CA0031CDC9 /* IDBKeyRangeData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBKeyRangeData.cpp; sourceTree = "<group>"; };
                5123AF171890A4CA0031CDC9 /* IDBKeyRangeData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBKeyRangeData.h; sourceTree = "<group>"; };
                5123AF1C18918AE40031CDC9 /* IDBGetResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBGetResult.h; sourceTree = "<group>"; };
                C50B561412119D23008B46E0 /* GroupSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GroupSettings.cpp; sourceTree = "<group>"; };
                C50B561512119D23008B46E0 /* GroupSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupSettings.h; sourceTree = "<group>"; };
                C50D0E810FF4272900AC2644 /* StorageNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespace.h; sourceTree = "<group>"; };
-               C5102D920FD9AA2D00FAFF04 /* StorageSyncManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageSyncManager.h; sourceTree = "<group>"; };
-               C5102D930FD9AA2D00FAFF04 /* StorageSyncManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageSyncManager.cpp; sourceTree = "<group>"; };
-               C5102ECD0FD9EF8C00FAFF04 /* StorageAreaSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaSync.h; sourceTree = "<group>"; };
-               C5102ECE0FD9EF8C00FAFF04 /* StorageAreaSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaSync.cpp; sourceTree = "<group>"; };
                C5137CF011A58378004ADB99 /* JSDOMStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMStringList.cpp; sourceTree = "<group>"; };
                C5137CF111A58378004ADB99 /* JSDOMStringList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMStringList.h; sourceTree = "<group>"; };
-               C5160EE81004543A00A7CEE2 /* StorageAreaImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaImpl.cpp; sourceTree = "<group>"; };
-               C5160EE91004543A00A7CEE2 /* StorageAreaImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaImpl.h; sourceTree = "<group>"; };
                C5278B0B17F212EA003A2998 /* PlatformPasteboardIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PlatformPasteboardIOS.mm; path = ios/PlatformPasteboardIOS.mm; sourceTree = "<group>"; };
                C544274911A57E7A0063A749 /* DOMStringList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMStringList.h; sourceTree = "<group>"; };
                C544274A11A57E7A0063A749 /* DOMStringList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMStringList.idl; sourceTree = "<group>"; };
                C55610F011A704EB00B82D27 /* DOMStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMStringList.cpp; sourceTree = "<group>"; };
                C55C7BA01718AFBA001327E4 /* RenderThemeIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RenderThemeIOS.mm; sourceTree = "<group>"; };
-               C55E38BB10040D5D00A56BDB /* StorageNamespaceImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespaceImpl.h; sourceTree = "<group>"; };
-               C55E38BC10040D5D00A56BDB /* StorageNamespaceImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespaceImpl.cpp; sourceTree = "<group>"; };
                C572EE1D1201C9BC007D8F82 /* JSIDBIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBIndex.h; sourceTree = "<group>"; };
                C57FEDE01212EE9C0097BE65 /* FileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystem.cpp; sourceTree = "<group>"; };
                C58361A71744523F00173511 /* FontServicesIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontServicesIOS.h; sourceTree = "<group>"; };
                                51E3F9C40DA059DC00250911 /* Storage.h */,
                                51E3F9D10DA05D7100250911 /* Storage.idl */,
                                51BE37DE0DAEE00E001085FC /* StorageArea.h */,
-                               C5160EE81004543A00A7CEE2 /* StorageAreaImpl.cpp */,
-                               C5160EE91004543A00A7CEE2 /* StorageAreaImpl.h */,
-                               C5102ECE0FD9EF8C00FAFF04 /* StorageAreaSync.cpp */,
-                               C5102ECD0FD9EF8C00FAFF04 /* StorageAreaSync.h */,
                                51E0BABA0DA5547100A9E417 /* StorageEvent.cpp */,
                                51E0BAB90DA5547100A9E417 /* StorageEvent.h */,
                                51E0BABD0DA5548400A9E417 /* StorageEvent.idl */,
                                51E0BB370DA5ACB600A9E417 /* StorageMap.cpp */,
                                51E0BB360DA5ACB600A9E417 /* StorageMap.h */,
                                C50D0E810FF4272900AC2644 /* StorageNamespace.h */,
-                               C55E38BC10040D5D00A56BDB /* StorageNamespaceImpl.cpp */,
-                               C55E38BB10040D5D00A56BDB /* StorageNamespaceImpl.h */,
                                1A3763691A2E68BB009A7EE2 /* StorageNamespaceProvider.cpp */,
                                1A37636A1A2E68BB009A7EE2 /* StorageNamespaceProvider.h */,
-                               C5102D930FD9AA2D00FAFF04 /* StorageSyncManager.cpp */,
-                               C5102D920FD9AA2D00FAFF04 /* StorageSyncManager.h */,
-                               511F23150DC160DA004F0032 /* StorageThread.cpp */,
-                               511F23160DC160DA004F0032 /* StorageThread.h */,
-                               3AB02D2912D4F91600FBB694 /* StorageTracker.cpp */,
-                               3AB02D2812D4F91600FBB694 /* StorageTracker.h */,
-                               3AC367FE12EF7A09006A3D6F /* StorageTrackerClient.h */,
                        );
                        indentWidth = 4;
                        path = storage;
                                A5AFB350115151A700B045CB /* StepRange.h in Headers */,
                                1AC2D845171734A100652FC0 /* Storage.h in Headers */,
                                51BE37E00DAEE00E001085FC /* StorageArea.h in Headers */,
-                               C5160EEB1004543A00A7CEE2 /* StorageAreaImpl.h in Headers */,
-                               C5102ECF0FD9EF8C00FAFF04 /* StorageAreaSync.h in Headers */,
                                51E0BABB0DA5547100A9E417 /* StorageEvent.h in Headers */,
                                C5EBDD84105EDDEC0056816F /* StorageEventDispatcher.h in Headers */,
                                51E0BB380DA5ACB600A9E417 /* StorageMap.h in Headers */,
                                C50D0E830FF4272900AC2644 /* StorageNamespace.h in Headers */,
-                               C55E38BF10040D5D00A56BDB /* StorageNamespaceImpl.h in Headers */,
-                               C5102D940FD9AA2D00FAFF04 /* StorageSyncManager.h in Headers */,
-                               511F231A0DC160DA004F0032 /* StorageThread.h in Headers */,
-                               3AB02D2A12D4F91600FBB694 /* StorageTracker.h in Headers */,
-                               3AC3680012EF7A09006A3D6F /* StorageTrackerClient.h in Headers */,
                                81AC6C36131C57D30009A7E0 /* StringCallback.h in Headers */,
                                B23540F30D00782E002382FA /* StringTruncator.h in Headers */,
                                9B6C41531344949000085B62 /* StringWithDirection.h in Headers */,
                                BC7FA62E0D1F0EFF00DB22A9 /* StaticNodeList.cpp in Sources */,
                                A5AFB34F115151A700B045CB /* StepRange.cpp in Sources */,
                                51E3F9C70DA059DC00250911 /* Storage.cpp in Sources */,
-                               C5160EEA1004543A00A7CEE2 /* StorageAreaImpl.cpp in Sources */,
-                               C5102ED00FD9EF8C00FAFF04 /* StorageAreaSync.cpp in Sources */,
                                51E0BABC0DA5547100A9E417 /* StorageEvent.cpp in Sources */,
                                C5E9B67710697E1300C7BB1A /* StorageEventDispatcher.cpp in Sources */,
                                51E0BB390DA5ACB600A9E417 /* StorageMap.cpp in Sources */,
-                               C55E38C010040D5D00A56BDB /* StorageNamespaceImpl.cpp in Sources */,
-                               C5102D950FD9AA2D00FAFF04 /* StorageSyncManager.cpp in Sources */,
-                               511F23190DC160DA004F0032 /* StorageThread.cpp in Sources */,
-                               3AB02D2B12D4F91600FBB694 /* StorageTracker.cpp in Sources */,
                                8102C5881325BB1100DDE67A /* StringCallback.cpp in Sources */,
                                B23540F20D00782E002382FA /* StringTruncator.cpp in Sources */,
                                BC5EB6A20E81DC4F00B25965 /* StyleBackgroundData.cpp in Sources */,
index 689283e..16a4ca4 100644 (file)
@@ -36,7 +36,6 @@
 #include "Page.h"
 #include "PageCache.h"
 #include "ScrollingThread.h"
-#include "StorageThread.h"
 #include "WorkerThread.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/FastMalloc.h>
index 992d5f8..60e466c 100644 (file)
@@ -1,3 +1,130 @@
+2014-12-29  Anders Carlsson  <andersca@apple.com>
+
+        Move storage code from WebCore to WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=139558
+
+        Reviewed by Darin Adler.
+
+        * Storage/StorageAreaImpl.cpp: Renamed from Source/WebCore/storage/StorageAreaImpl.cpp.
+        (WebCore::StorageAreaImpl::~StorageAreaImpl):
+        (WebCore::StorageAreaImpl::StorageAreaImpl):
+        (WebCore::StorageAreaImpl::create):
+        (WebCore::StorageAreaImpl::copy):
+        (WebCore::StorageAreaImpl::canAccessStorage):
+        (WebCore::StorageAreaImpl::storageType):
+        (WebCore::StorageAreaImpl::length):
+        (WebCore::StorageAreaImpl::key):
+        (WebCore::StorageAreaImpl::item):
+        (WebCore::StorageAreaImpl::setItem):
+        (WebCore::StorageAreaImpl::removeItem):
+        (WebCore::StorageAreaImpl::clear):
+        (WebCore::StorageAreaImpl::contains):
+        (WebCore::StorageAreaImpl::importItems):
+        (WebCore::StorageAreaImpl::close):
+        (WebCore::StorageAreaImpl::clearForOriginDeletion):
+        (WebCore::StorageAreaImpl::sync):
+        (WebCore::StorageAreaImpl::blockUntilImportComplete):
+        (WebCore::StorageAreaImpl::memoryBytesUsedByCache):
+        (WebCore::StorageAreaImpl::incrementAccessCount):
+        (WebCore::StorageAreaImpl::decrementAccessCount):
+        (WebCore::StorageAreaImpl::closeDatabaseTimerFired):
+        (WebCore::StorageAreaImpl::closeDatabaseIfIdle):
+        (WebCore::StorageAreaImpl::dispatchStorageEvent):
+        * Storage/StorageAreaImpl.h: Renamed from Source/WebCore/storage/StorageAreaImpl.h.
+        * Storage/StorageAreaSync.cpp: Renamed from Source/WebCore/storage/StorageAreaSync.cpp.
+        (WebCore::StorageAreaSync::StorageAreaSync):
+        (WebCore::StorageAreaSync::create):
+        (WebCore::StorageAreaSync::~StorageAreaSync):
+        (WebCore::StorageAreaSync::scheduleFinalSync):
+        (WebCore::StorageAreaSync::scheduleItemForSync):
+        (WebCore::StorageAreaSync::scheduleClear):
+        (WebCore::StorageAreaSync::scheduleCloseDatabase):
+        (WebCore::StorageAreaSync::syncTimerFired):
+        (WebCore::StorageAreaSync::openDatabase):
+        (WebCore::StorageAreaSync::migrateItemTableIfNeeded):
+        (WebCore::StorageAreaSync::performImport):
+        (WebCore::StorageAreaSync::markImported):
+        (WebCore::StorageAreaSync::blockUntilImportComplete):
+        (WebCore::StorageAreaSync::sync):
+        (WebCore::StorageAreaSync::performSync):
+        (WebCore::StorageAreaSync::deleteEmptyDatabase):
+        (WebCore::StorageAreaSync::scheduleSync):
+        * Storage/StorageAreaSync.h: Renamed from Source/WebCore/storage/StorageAreaSync.h.
+        * Storage/StorageNamespaceImpl.cpp: Renamed from Source/WebCore/storage/StorageNamespaceImpl.cpp.
+        (WebCore::localStorageNamespaceMap):
+        (WebCore::StorageNamespaceImpl::createSessionStorageNamespace):
+        (WebCore::StorageNamespaceImpl::getOrCreateLocalStorageNamespace):
+        (WebCore::StorageNamespaceImpl::StorageNamespaceImpl):
+        (WebCore::StorageNamespaceImpl::~StorageNamespaceImpl):
+        (WebCore::StorageNamespaceImpl::copy):
+        (WebCore::StorageNamespaceImpl::storageArea):
+        (WebCore::StorageNamespaceImpl::close):
+        (WebCore::StorageNamespaceImpl::clearOriginForDeletion):
+        (WebCore::StorageNamespaceImpl::clearAllOriginsForDeletion):
+        (WebCore::StorageNamespaceImpl::sync):
+        (WebCore::StorageNamespaceImpl::closeIdleLocalStorageDatabases):
+        * Storage/StorageNamespaceImpl.h: Renamed from Source/WebCore/storage/StorageNamespaceImpl.h.
+        * Storage/StorageSyncManager.cpp: Renamed from Source/WebCore/storage/StorageSyncManager.cpp.
+        (WebCore::StorageSyncManager::create):
+        (WebCore::StorageSyncManager::StorageSyncManager):
+        (WebCore::StorageSyncManager::~StorageSyncManager):
+        (WebCore::StorageSyncManager::fullDatabaseFilename):
+        (WebCore::StorageSyncManager::dispatch):
+        (WebCore::StorageSyncManager::close):
+        * Storage/StorageSyncManager.h: Renamed from Source/WebCore/storage/StorageSyncManager.h.
+        * Storage/StorageThread.cpp: Renamed from Source/WebCore/storage/StorageThread.cpp.
+        (WebCore::activeStorageThreads):
+        (WebCore::StorageThread::StorageThread):
+        (WebCore::StorageThread::~StorageThread):
+        (WebCore::StorageThread::start):
+        (WebCore::StorageThread::threadEntryPointCallback):
+        (WebCore::StorageThread::threadEntryPoint):
+        (WebCore::StorageThread::dispatch):
+        (WebCore::StorageThread::terminate):
+        (WebCore::StorageThread::performTerminate):
+        (WebCore::StorageThread::releaseFastMallocFreeMemoryInAllThreads):
+        * Storage/StorageThread.h: Renamed from Source/WebCore/storage/StorageThread.h.
+        * Storage/StorageTracker.cpp: Renamed from Source/WebCore/storage/StorageTracker.cpp.
+        (WebCore::StorageTracker::initializeTracker):
+        (WebCore::StorageTracker::internalInitialize):
+        (WebCore::StorageTracker::tracker):
+        (WebCore::StorageTracker::StorageTracker):
+        (WebCore::StorageTracker::setDatabaseDirectoryPath):
+        (WebCore::StorageTracker::databaseDirectoryPath):
+        (WebCore::StorageTracker::trackerDatabasePath):
+        (WebCore::ensureDatabaseFileExists):
+        (WebCore::StorageTracker::openTrackerDatabase):
+        (WebCore::StorageTracker::importOriginIdentifiers):
+        (WebCore::StorageTracker::finishedImportingOriginIdentifiers):
+        (WebCore::StorageTracker::syncImportOriginIdentifiers):
+        (WebCore::StorageTracker::syncFileSystemAndTrackerDatabase):
+        (WebCore::StorageTracker::setOriginDetails):
+        (WebCore::StorageTracker::syncSetOriginDetails):
+        (WebCore::StorageTracker::origins):
+        (WebCore::StorageTracker::deleteAllOrigins):
+        (WebCore::truncateDatabaseFile):
+        (WebCore::StorageTracker::syncDeleteAllOrigins):
+        (WebCore::StorageTracker::deleteOriginWithIdentifier):
+        (WebCore::StorageTracker::deleteOrigin):
+        (WebCore::StorageTracker::syncDeleteOrigin):
+        (WebCore::StorageTracker::willDeleteAllOrigins):
+        (WebCore::StorageTracker::willDeleteOrigin):
+        (WebCore::StorageTracker::canDeleteOrigin):
+        (WebCore::StorageTracker::cancelDeletingOrigin):
+        (WebCore::StorageTracker::isActive):
+        (WebCore::StorageTracker::setIsActive):
+        (WebCore::StorageTracker::databasePathForOrigin):
+        (WebCore::StorageTracker::diskUsageForOrigin):
+        * Storage/StorageTracker.h: Renamed from Source/WebCore/storage/StorageTracker.h.
+        (WebCore::StorageTracker::storageDatabaseIdleInterval):
+        (WebCore::StorageTracker::setStorageDatabaseIdleInterval):
+        * Storage/StorageTrackerClient.h: Renamed from Source/WebCore/storage/StorageTrackerClient.h.
+        (WebCore::StorageTrackerClient::~StorageTrackerClient):
+        * Storage/WebStorageNamespaceProvider.cpp:
+        * WebKit.vcxproj/WebKit/WebKit.vcxproj:
+        * WebKit.vcxproj/WebKit/WebKit.vcxproj.filters:
+        * WebKit.xcodeproj/project.pbxproj:
+
 2014-12-22  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Build fix after r177668.
similarity index 98%
rename from Source/WebCore/storage/StorageAreaImpl.cpp
rename to Source/WebKit/Storage/StorageAreaImpl.cpp
index 587bbbb..08ea167 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "StorageAreaImpl.h"
 
-#include "Frame.h"
-#include "SecurityOrigin.h"
 #include "StorageAreaSync.h"
-#include "StorageEventDispatcher.h"
-#include "StorageMap.h"
 #include "StorageSyncManager.h"
 #include "StorageTracker.h"
+#include <WebCore/Frame.h>
+#include <WebCore/SecurityOrigin.h>
+#include <WebCore/StorageEventDispatcher.h>
+#include <WebCore/StorageMap.h>
 #include <wtf/MainThread.h>
 
 namespace WebCore {
similarity index 98%
rename from Source/WebCore/storage/StorageAreaImpl.h
rename to Source/WebKit/Storage/StorageAreaImpl.h
index 89761a1..0ed92e7 100644 (file)
@@ -26,9 +26,8 @@
 #ifndef StorageAreaImpl_h
 #define StorageAreaImpl_h
 
-#include "StorageArea.h"
-#include "Timer.h"
-
+#include <WebCore/StorageArea.h>
+#include <WebCore/Timer.h>
 #include <wtf/HashMap.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
similarity index 97%
rename from Source/WebCore/storage/StorageAreaSync.cpp
rename to Source/WebKit/Storage/StorageAreaSync.cpp
index 4602d8f..01d9e92 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "StorageAreaSync.h"
 
-#include "FileSystem.h"
-#include "SQLiteDatabaseTracker.h"
-#include "SQLiteStatement.h"
-#include "SQLiteTransaction.h"
 #include "StorageAreaImpl.h"
 #include "StorageSyncManager.h"
 #include "StorageTracker.h"
-#include "SuddenTermination.h"
+#include <WebCore/FileSystem.h>
+#include <WebCore/SQLiteDatabaseTracker.h>
+#include <WebCore/SQLiteStatement.h>
+#include <WebCore/SQLiteTransaction.h>
+#include <WebCore/SuddenTermination.h>
 #include <wtf/MainThread.h>
 
 namespace WebCore {
@@ -98,7 +97,7 @@ void StorageAreaSync::scheduleFinalSync()
         // syncTimerFired function.
         disableSuddenTermination();
     }
-    // FIXME: This is synchronous.  We should do it on the background process, but
+    // FIXME: This is synchronous. We should do it on the background process, but
     // we should do it safely.
     m_finalSyncScheduled = true;
     syncTimerFired();
@@ -168,7 +167,7 @@ void StorageAreaSync::syncTimerFired()
         MutexLocker locker(m_syncLock);
 
         // Do not schedule another sync if we're still trying to complete the
-        // previous one.  But, if we're shutting down, schedule it anyway.
+        // previous one. But, if we're shutting down, schedule it anyway.
         if (m_syncInProgress && !m_finalSyncScheduled) {
             ASSERT(!m_syncTimer.isActive());
             m_syncTimer.startOneShot(StorageSyncInterval);
@@ -193,7 +192,7 @@ void StorageAreaSync::syncTimerFired()
 
         if (partialSync) {
             // We can't do the fast path of simply clearing all items, so we'll need to manually
-            // remove them one by one.  Done under lock since m_itemsPendingSync is modified by
+            // remove them one by one. Done under lock since m_itemsPendingSync is modified by
             // the background thread.
             HashMap<String, String>::iterator pending_it = m_itemsPendingSync.begin();
             HashMap<String, String>::iterator pending_end = m_itemsPendingSync.end();
@@ -369,7 +368,7 @@ void StorageAreaSync::blockUntilImportComplete()
 {
     ASSERT(isMainThread());
 
-    // Fast path.  We set m_storageArea to 0 only after m_importComplete being true.
+    // Fast path. We set m_storageArea to 0 only after m_importComplete being true.
     if (!m_storageArea)
         return;
 
similarity index 96%
rename from Source/WebCore/storage/StorageAreaSync.h
rename to Source/WebKit/Storage/StorageAreaSync.h
index baeaac7..8fbf75b 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef StorageAreaSync_h
 #define StorageAreaSync_h
 
-#include "SQLiteDatabase.h"
-#include "Timer.h"
+#include <WebCore/SQLiteDatabase.h>
+#include <WebCore/Timer.h>
 #include <wtf/HashMap.h>
 #include <wtf/text/StringHash.h>
 
@@ -75,8 +75,8 @@ public:
 
 private:
     enum OpenDatabaseParamType {
-      CreateIfNonExistent,
-      SkipIfNonExistent
+        CreateIfNonExistent,
+        SkipIfNonExistent
     };
 
     void syncTimerFired();
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "StorageNamespaceImpl.h"
 
-#include "SecurityOriginHash.h"
 #include "StorageAreaImpl.h"
-#include "StorageMap.h"
 #include "StorageSyncManager.h"
 #include "StorageTracker.h"
+#include <WebCore/StorageMap.h>
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/text/StringHash.h>
similarity index 96%
rename from Source/WebCore/storage/StorageNamespaceImpl.h
rename to Source/WebKit/Storage/StorageNamespaceImpl.h
index 81bc505..eee8b1c 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef StorageNamespaceImpl_h
 #define StorageNamespaceImpl_h
 
-#include "SecurityOriginHash.h"
-#include "StorageArea.h"
-#include "StorageNamespace.h"
+#include <WebCore/SecurityOriginHash.h>
+#include <WebCore/StorageArea.h>
+#include <WebCore/StorageNamespace.h>
 #include <wtf/HashMap.h>
 #include <wtf/RefPtr.h>
 #include <wtf/text/WTFString.h>
similarity index 98%
rename from Source/WebCore/storage/StorageSyncManager.cpp
rename to Source/WebKit/Storage/StorageSyncManager.cpp
index 637a49f..036d6ba 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "StorageSyncManager.h"
 
-#include "FileSystem.h"
 #include "StorageThread.h"
+#include <WebCore/FileSystem.h>
 #include <wtf/MainThread.h>
 #include <wtf/text/CString.h>
 
similarity index 99%
rename from Source/WebCore/storage/StorageThread.cpp
rename to Source/WebKit/Storage/StorageThread.cpp
index 6ecde97..505c1df 100644 (file)
@@ -23,7 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "StorageThread.h"
 
 #include <wtf/AutodrainedPool.h>
similarity index 98%
rename from Source/WebCore/storage/StorageTracker.cpp
rename to Source/WebKit/Storage/StorageTracker.cpp
index db6a944..2583d17 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
 #include "StorageTracker.h"
 
-#include "FileSystem.h"
-#include "PageGroup.h"
-#include "SQLiteDatabaseTracker.h"
-#include "SQLiteStatement.h"
-#include "SecurityOrigin.h"
 #include "StorageThread.h"
 #include "StorageTrackerClient.h"
-#include "TextEncoding.h"
+#include <WebCore/FileSystem.h>
+#include <WebCore/PageGroup.h>
+#include <WebCore/SQLiteDatabaseTracker.h>
+#include <WebCore/SQLiteStatement.h>
+#include <WebCore/SecurityOrigin.h>
+#include <WebCore/TextEncoding.h>
 #include <wtf/MainThread.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/Vector.h>
similarity index 99%
rename from Source/WebCore/storage/StorageTracker.h
rename to Source/WebKit/Storage/StorageTracker.h
index 9d6ac77..a770593 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef StorageTracker_h
 #define StorageTracker_h
 
-#include "SQLiteDatabase.h"
+#include <WebCore/SQLiteDatabase.h>
 #include <wtf/HashSet.h>
 #include <wtf/Vector.h>
 #include <wtf/text/StringHash.h>
index e20940a..ab46c96 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "WebStorageNamespaceProvider.h"
 
-#include <WebCore/StorageNamespaceImpl.h>
+#include "StorageNamespaceImpl.h"
 #include <wtf/NeverDestroyed.h>
 
 using namespace WebCore;
index 0915235..fc56a99 100644 (file)
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\Storage\StorageAreaImpl.cpp" />
+    <ClCompile Include="..\..\Storage\StorageAreaSync.cpp" />
+    <ClCompile Include="..\..\Storage\StorageNamespaceImpl.cpp" />
+    <ClCompile Include="..\..\Storage\StorageSyncManager.cpp" />
+    <ClCompile Include="..\..\Storage\StorageThread.cpp" />
+    <ClCompile Include="..\..\Storage\StorageTracker.cpp" />
     <ClCompile Include="..\..\Storage\WebStorageNamespaceProvider.cpp" />
     <ClCompile Include="..\..\cf\WebCoreSupport\WebInspectorClientCF.cpp" />
     <ClCompile Include="..\..\win\AccessibleBase.cpp" />
     <ClCompile Include="..\..\win\WebWorkersPrivate.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\Storage\StorageAreaImpl.h" />
+    <ClInclude Include="..\..\Storage\StorageAreaSync.h" />
+    <ClInclude Include="..\..\Storage\StorageNamespaceImpl.h" />
+    <ClInclude Include="..\..\Storage\StorageSyncManager.h" />
+    <ClInclude Include="..\..\Storage\StorageThread.h" />
+    <ClInclude Include="..\..\Storage\StorageTracker.h" />
+    <ClInclude Include="..\..\Storage\StorageTrackerClient.h" />
     <ClInclude Include="..\..\Storage\WebStorageNamespaceProvider.h" />
     <ClInclude Include="..\..\win\AccessibleBase.h" />
     <ClInclude Include="..\..\win\AccessibleDocument.h" />
index fdc8679..12dd953 100644 (file)
     <ClCompile Include="..\..\win\WebSerializedJSValue.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Storage\StorageAreaImpl.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Storage\StorageAreaSync.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Storage\StorageNamespaceImpl.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Storage\StorageSyncManager.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Storage\StorageThread.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Storage\StorageTracker.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\Storage\WebStorageNamespaceProvider.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
     <ClInclude Include="..\..\win\WebCoreSupport\AcceleratedCompositingContext.h">
       <Filter>WebCoreSupport</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Storage\StorageAreaImpl.h">
+      <Filter>Sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Storage\StorageAreaSync.h">
+      <Filter>Sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Storage\StorageNamespaceImpl.h">
+      <Filter>Sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Storage\StorageSyncManager.h">
+      <Filter>Sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Storage\StorageThread.h">
+      <Filter>Sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Storage\StorageTracker.h">
+      <Filter>Sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Storage\StorageTrackerClient.h">
+      <Filter>Sources</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Storage\WebStorageNamespaceProvider.h">
       <Filter>Header Files</Filter>
     </ClInclude>
index 3bb5a6d..91680bb 100644 (file)
                1A60519417502A5D00BC62F5 /* HistoryPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */; };
                1A6A208D1886154600E50F5F /* WebProgressTrackerClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */; };
                1A6A208E1886154600E50F5F /* WebProgressTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */; };
+               1A6B31311A51F3A900422975 /* StorageAreaImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6B31241A51F3A900422975 /* StorageAreaImpl.cpp */; };
+               1A6B31321A51F3A900422975 /* StorageAreaImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6B31251A51F3A900422975 /* StorageAreaImpl.h */; };
+               1A6B31331A51F3A900422975 /* StorageAreaSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6B31261A51F3A900422975 /* StorageAreaSync.cpp */; };
+               1A6B31341A51F3A900422975 /* StorageAreaSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6B31271A51F3A900422975 /* StorageAreaSync.h */; };
+               1A6B31351A51F3A900422975 /* StorageNamespaceImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6B31281A51F3A900422975 /* StorageNamespaceImpl.cpp */; };
+               1A6B31361A51F3A900422975 /* StorageNamespaceImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6B31291A51F3A900422975 /* StorageNamespaceImpl.h */; };
+               1A6B31371A51F3A900422975 /* StorageSyncManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6B312A1A51F3A900422975 /* StorageSyncManager.cpp */; };
+               1A6B31381A51F3A900422975 /* StorageSyncManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6B312B1A51F3A900422975 /* StorageSyncManager.h */; };
+               1A6B31391A51F3A900422975 /* StorageThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6B312C1A51F3A900422975 /* StorageThread.cpp */; };
+               1A6B313A1A51F3A900422975 /* StorageThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6B312D1A51F3A900422975 /* StorageThread.h */; };
+               1A6B313B1A51F3A900422975 /* StorageTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6B312E1A51F3A900422975 /* StorageTracker.cpp */; };
+               1A6B313C1A51F3A900422975 /* StorageTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6B312F1A51F3A900422975 /* StorageTracker.h */; };
+               1A6B313D1A51F3A900422975 /* StorageTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6B31301A51F3A900422975 /* StorageTrackerClient.h */; };
                1A74A28E0F4F75400082E228 /* WebTextInputWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */; };
                1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */; };
                1A77B02E0EE7730500C8A1F9 /* WebPluginRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */; };
                1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryPropertyList.h; sourceTree = "<group>"; };
                1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProgressTrackerClient.mm; sourceTree = "<group>"; };
                1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProgressTrackerClient.h; sourceTree = "<group>"; };
+               1A6B31241A51F3A900422975 /* StorageAreaImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StorageAreaImpl.cpp; path = Storage/StorageAreaImpl.cpp; sourceTree = SOURCE_ROOT; };
+               1A6B31251A51F3A900422975 /* StorageAreaImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StorageAreaImpl.h; path = Storage/StorageAreaImpl.h; sourceTree = SOURCE_ROOT; };
+               1A6B31261A51F3A900422975 /* StorageAreaSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StorageAreaSync.cpp; path = Storage/StorageAreaSync.cpp; sourceTree = SOURCE_ROOT; };
+               1A6B31271A51F3A900422975 /* StorageAreaSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StorageAreaSync.h; path = Storage/StorageAreaSync.h; sourceTree = SOURCE_ROOT; };
+               1A6B31281A51F3A900422975 /* StorageNamespaceImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StorageNamespaceImpl.cpp; path = Storage/StorageNamespaceImpl.cpp; sourceTree = SOURCE_ROOT; };
+               1A6B31291A51F3A900422975 /* StorageNamespaceImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StorageNamespaceImpl.h; path = Storage/StorageNamespaceImpl.h; sourceTree = SOURCE_ROOT; };
+               1A6B312A1A51F3A900422975 /* StorageSyncManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StorageSyncManager.cpp; path = Storage/StorageSyncManager.cpp; sourceTree = SOURCE_ROOT; };
+               1A6B312B1A51F3A900422975 /* StorageSyncManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StorageSyncManager.h; path = Storage/StorageSyncManager.h; sourceTree = SOURCE_ROOT; };
+               1A6B312C1A51F3A900422975 /* StorageThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StorageThread.cpp; path = Storage/StorageThread.cpp; sourceTree = SOURCE_ROOT; };
+               1A6B312D1A51F3A900422975 /* StorageThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StorageThread.h; path = Storage/StorageThread.h; sourceTree = SOURCE_ROOT; };
+               1A6B312E1A51F3A900422975 /* StorageTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StorageTracker.cpp; path = Storage/StorageTracker.cpp; sourceTree = SOURCE_ROOT; };
+               1A6B312F1A51F3A900422975 /* StorageTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StorageTracker.h; path = Storage/StorageTracker.h; sourceTree = SOURCE_ROOT; };
+               1A6B31301A51F3A900422975 /* StorageTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StorageTrackerClient.h; path = Storage/StorageTrackerClient.h; sourceTree = SOURCE_ROOT; };
                1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebTextInputWindowController.h; sourceTree = "<group>"; };
                1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = WebTextInputWindowController.m; sourceTree = "<group>"; };
                1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginRequest.h; sourceTree = "<group>"; };
                        isa = PBXGroup;
                        children = (
                                A10C1D3F18202FDC0036883A /* ios */,
+                               1A6B31241A51F3A900422975 /* StorageAreaImpl.cpp */,
+                               1A6B31251A51F3A900422975 /* StorageAreaImpl.h */,
+                               1A6B31261A51F3A900422975 /* StorageAreaSync.cpp */,
+                               1A6B31271A51F3A900422975 /* StorageAreaSync.h */,
+                               1A6B31281A51F3A900422975 /* StorageNamespaceImpl.cpp */,
+                               1A6B31291A51F3A900422975 /* StorageNamespaceImpl.h */,
+                               1A6B312A1A51F3A900422975 /* StorageSyncManager.cpp */,
+                               1A6B312B1A51F3A900422975 /* StorageSyncManager.h */,
+                               1A6B312C1A51F3A900422975 /* StorageThread.cpp */,
+                               1A6B312D1A51F3A900422975 /* StorageThread.h */,
+                               1A6B312E1A51F3A900422975 /* StorageTracker.cpp */,
+                               1A6B312F1A51F3A900422975 /* StorageTracker.h */,
+                               1A6B31301A51F3A900422975 /* StorageTrackerClient.h */,
                                511F3FD10CECC88F00852565 /* WebDatabaseManager.mm */,
                                511F3FD30CECC88F00852565 /* WebDatabaseManagerClient.h */,
                                511F3FD40CECC88F00852565 /* WebDatabaseManagerClient.mm */,
                                939810660824BF01008DF038 /* CarbonWindowContentView.h in Headers */,
                                939810670824BF01008DF038 /* CarbonWindowFrame.h in Headers */,
                                B82958D3132707D0000D0E79 /* CorrectionPanel.h in Headers */,
+                               1A6B313A1A51F3A900422975 /* StorageThread.h in Headers */,
                                1A60519417502A5D00BC62F5 /* HistoryPropertyList.h in Headers */,
                                939810680824BF01008DF038 /* HIViewAdapter.h in Headers */,
                                1A6A208E1886154600E50F5F /* WebProgressTrackerClient.h in Headers */,
                                939810760824BF01008DF038 /* WebDefaultUIDelegate.h in Headers */,
                                BC542C420FD7766F00D8AB5D /* WebDelegateImplementationCaching.h in Headers */,
                                598AD9201201CF0700ABAE4E /* WebDeviceOrientation.h in Headers */,
+                               1A6B31381A51F3A900422975 /* StorageSyncManager.h in Headers */,
                                598AD91A1201CEC900ABAE4E /* WebDeviceOrientationClient.h in Headers */,
                                598AD9241201CF1900ABAE4E /* WebDeviceOrientationInternal.h in Headers */,
                                A17A11B1180DC84800E5498C /* WebPluginPackagePrivate.h in Headers */,
                                939810770824BF01008DF038 /* WebDownload.h in Headers */,
                                ABDDF20D08EB0DDC001E1241 /* WebDownloadInternal.h in Headers */,
                                A70936AF0B5608DC00CDB48E /* WebDragClient.h in Headers */,
+                               1A6B313C1A51F3A900422975 /* StorageTracker.h in Headers */,
                                939810510824BF01008DF038 /* WebDynamicScrollBarsView.h in Headers */,
                                934C11670D8710BB00C32ABD /* WebDynamicScrollBarsViewInternal.h in Headers */,
                                9398109E0824BF01008DF038 /* WebEditingDelegate.h in Headers */,
                                DD89682009AA87240097E7F0 /* WebElementDictionary.h in Headers */,
                                939810520824BF01008DF038 /* WebFormDelegate.h in Headers */,
                                939810640824BF01008DF038 /* WebFormDelegatePrivate.h in Headers */,
+                               1A6B31341A51F3A900422975 /* StorageAreaSync.h in Headers */,
                                939810530824BF01008DF038 /* WebFrame.h in Headers */,
                                A10C1D1A18202F9C0036883A /* WebDefaultFrameLoadDelegate.h in Headers */,
                                9398109C0824BF01008DF038 /* WebFrameInternal.h in Headers */,
                                939810550824BF01008DF038 /* WebHTMLRepresentation.h in Headers */,
                                939810560824BF01008DF038 /* WebHTMLRepresentationPrivate.h in Headers */,
                                939810570824BF01008DF038 /* WebHTMLView.h in Headers */,
+                               1A6B313D1A51F3A900422975 /* StorageTrackerClient.h in Headers */,
                                939810A10824BF01008DF038 /* WebHTMLViewInternal.h in Headers */,
                                939810580824BF01008DF038 /* WebHTMLViewPrivate.h in Headers */,
                                939810180824BF01008DF038 /* WebIconDatabase.h in Headers */,
                                51B2A1000ADB15D0002A9BEE /* WebIconDatabaseDelegate.h in Headers */,
                                9304B3000B02341500F7850D /* WebIconDatabaseInternal.h in Headers */,
                                939810190824BF01008DF038 /* WebIconDatabasePrivate.h in Headers */,
+                               1A6B31321A51F3A900422975 /* StorageAreaImpl.h in Headers */,
                                A10C1D641820300E0036883A /* WebChromeClientIOS.h in Headers */,
                                5D7BF8140C2A1D90008CE06D /* WebInspector.h in Headers */,
                                06693DDC0BFBA85200216072 /* WebInspectorClient.h in Headers */,
                                939810B00824BF01008DF038 /* WebPluginContainerPrivate.h in Headers */,
                                1AC7176F1A26568A002E3115 /* WebVisitedLinkStore.h in Headers */,
                                939810370824BF01008DF038 /* WebPluginController.h in Headers */,
+                               1A6B31361A51F3A900422975 /* StorageNamespaceImpl.h in Headers */,
                                7C1FB3C21846E8E1001A03D8 /* WebAllowDenyPolicyListener.h in Headers */,
                                939810380824BF01008DF038 /* WebPluginDatabase.h in Headers */,
                                939810390824BF01008DF038 /* WebPluginPackage.h in Headers */,
                                9398110A0824BF01008DF038 /* WebDefaultUIDelegate.m in Sources */,
                                BC542C430FD7766F00D8AB5D /* WebDelegateImplementationCaching.mm in Sources */,
                                598AD9221201CF1000ABAE4E /* WebDeviceOrientation.mm in Sources */,
+                               1A6B31331A51F3A900422975 /* StorageAreaSync.cpp in Sources */,
                                1A6A208D1886154600E50F5F /* WebProgressTrackerClient.mm in Sources */,
                                598AD91E1201CECF00ABAE4E /* WebDeviceOrientationClient.mm in Sources */,
                                598AD9281201CF3200ABAE4E /* WebDeviceOrientationProviderMock.mm in Sources */,
                                51494CD70C7EBDE0004178C5 /* WebIconDatabaseClient.mm in Sources */,
                                5D7BF8150C2A1D90008CE06D /* WebInspector.mm in Sources */,
                                06693DDD0BFBA85200216072 /* WebInspectorClient.mm in Sources */,
+                               1A6B31311A51F3A900422975 /* StorageAreaImpl.cpp in Sources */,
                                1C7B0C660EB2464D00A28502 /* WebInspectorClientCF.cpp in Sources */,
                                B80417701217A83100466BAE /* WebInspectorFrontend.mm in Sources */,
                                A10C1D1918202F9C0036883A /* WebDefaultFormDelegate.m in Sources */,
                                939810E40824BF01008DF038 /* WebJavaScriptTextInputPanel.m in Sources */,
                                A10C1D8B1820305E0036883A /* WebPDFViewIOS.mm in Sources */,
+                               1A6B31371A51F3A900422975 /* StorageSyncManager.cpp in Sources */,
                                37D1DCA91065928C0068F7EF /* WebJSPDFDoc.mm in Sources */,
                                939811170824BF01008DF038 /* WebKeyGenerator.mm in Sources */,
                                939811030824BF01008DF038 /* WebKitErrors.m in Sources */,
                                312E2FE614E48182007CCA18 /* WebNotification.mm in Sources */,
                                31C11A6F1476552E0049A4CC /* WebNotificationClient.mm in Sources */,
                                EDE983810BCDF5FE00FDAE28 /* WebNSArrayExtras.m in Sources */,
+                               1A6B31391A51F3A900422975 /* StorageThread.cpp in Sources */,
                                A560946714D8AD2600799A8A /* WebIndicateLayer.mm in Sources */,
                                939810C60824BF01008DF038 /* WebNSControlExtras.m in Sources */,
                                939811150824BF01008DF038 /* WebNSDataExtras.m in Sources */,
                                936A2DE80FD2D08000D312DB /* WebTextCompletionController.mm in Sources */,
                                A10C1D3E18202FC50036883A /* WebUIKitSupport.mm in Sources */,
                                1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */,
+                               1A6B31351A51F3A900422975 /* StorageNamespaceImpl.cpp in Sources */,
                                F834AAD80E64B1C700E2737C /* WebTextIterator.mm in Sources */,
                                A10C1D1D18202F9C0036883A /* WebDefaultResourceLoadDelegate.m in Sources */,
                                939810BE0824BF01008DF038 /* WebURLsWithTitles.m in Sources */,
                                C0C5B3EF1177A4A0002B0AEF /* WebUserContentURLPattern.mm in Sources */,
                                1AB1DAC118BC0232004B6A9F /* WebViewGroup.mm in Sources */,
                                939811070824BF01008DF038 /* WebView.mm in Sources */,
+                               1A6B313B1A51F3A900422975 /* StorageTracker.cpp in Sources */,
                                BC2E464E0FD8A96800A9D9DE /* WebViewData.mm in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
index cb9204e..207753e 100644 (file)
@@ -1,3 +1,14 @@
+2014-12-29  Anders Carlsson  <andersca@apple.com>
+
+        Move storage code from WebCore to WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=139558
+
+        Reviewed by Darin Adler.
+
+        * Storage/WebStorageManager.mm:
+        * Storage/WebStorageTrackerClient.h:
+        * WebView/WebView.mm:
+
 2014-12-26  Dan Bernstein  <mitz@apple.com>
 
         <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
index bf0e912..af92d76 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "WebSecurityOriginInternal.h"
-#import "WebStorageManagerPrivate.h"
 #import "WebStorageManagerInternal.h"
-#import "WebStorageTrackerClient.h"
 
+#import "StorageTracker.h"
+#import "WebSecurityOriginInternal.h"
+#import "WebStorageTrackerClient.h"
 #import <WebCore/PageGroup.h>
 #import <WebCore/SecurityOrigin.h>
-#import <WebCore/StorageTracker.h>
 #import <pthread.h>
 
 using namespace WebCore;
index 688b4bc..bd31db2 100644 (file)
@@ -22,5 +22,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#import "WebStorageManagerPrivate.h"
+
 void WebKitInitializeStorageIfNecessary();
index fe8a3fc..04879eb 100644 (file)
@@ -23,8 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
  
+#import "StorageTrackerClient.h"
 #import <WebCore/SecurityOrigin.h>
-#import <WebCore/StorageTrackerClient.h>
 
 using namespace WebCore;
 
index 4f8c9a3..ca829f0 100644 (file)
@@ -36,6 +36,7 @@
 #import "DOMNodeInternal.h"
 #import "DOMRangeInternal.h"
 #import "DictionaryPopupInfo.h"
+#import "StorageThread.h"
 #import "WebAlternativeTextClient.h"
 #import "WebApplicationCache.h"
 #import "WebBackForwardListInternal.h"
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/SecurityPolicy.h>
 #import <WebCore/Settings.h>
-#import <WebCore/StorageThread.h>
 #import <WebCore/StyleProperties.h>
 #import <WebCore/TextResourceDecoder.h>
 #import <WebCore/ThreadCheck.h>
index fd879f3..b1f692a 100644 (file)
@@ -1,3 +1,12 @@
+2014-12-29  Anders Carlsson  <andersca@apple.com>
+
+        Move storage code from WebCore to WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=139558
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/WebProcess.cpp:
+
 2014-12-29  Dan Bernstein  <mitz@apple.com>
 
         Fixed the iOS build.
index 000ab6d..98d376b 100644 (file)
@@ -85,7 +85,6 @@
 #include <WebCore/SchemeRegistry.h>
 #include <WebCore/SecurityOrigin.h>
 #include <WebCore/Settings.h>
-#include <WebCore/StorageTracker.h>
 #include <unistd.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/HashCountedSet.h>