diff options
Diffstat (limited to 'WebCore/storage')
-rw-r--r-- | WebCore/storage/LocalStorage.cpp | 7 | ||||
-rw-r--r-- | WebCore/storage/LocalStorage.h | 4 | ||||
-rw-r--r-- | WebCore/storage/LocalStorageArea.cpp | 5 | ||||
-rw-r--r-- | WebCore/storage/LocalStorageArea.h | 4 | ||||
-rw-r--r-- | WebCore/storage/LocalStorageTask.cpp | 5 | ||||
-rw-r--r-- | WebCore/storage/LocalStorageTask.h | 4 | ||||
-rw-r--r-- | WebCore/storage/LocalStorageThread.cpp | 5 | ||||
-rw-r--r-- | WebCore/storage/LocalStorageThread.h | 4 | ||||
-rw-r--r-- | WebCore/storage/SessionStorage.cpp | 5 | ||||
-rw-r--r-- | WebCore/storage/SessionStorage.h | 4 | ||||
-rw-r--r-- | WebCore/storage/SessionStorageArea.cpp | 5 | ||||
-rw-r--r-- | WebCore/storage/SessionStorageArea.h | 4 | ||||
-rw-r--r-- | WebCore/storage/Storage.cpp | 5 | ||||
-rw-r--r-- | WebCore/storage/Storage.h | 4 | ||||
-rw-r--r-- | WebCore/storage/Storage.idl | 3 | ||||
-rw-r--r-- | WebCore/storage/StorageArea.cpp | 5 | ||||
-rw-r--r-- | WebCore/storage/StorageArea.h | 4 | ||||
-rw-r--r-- | WebCore/storage/StorageEvent.cpp | 5 | ||||
-rw-r--r-- | WebCore/storage/StorageEvent.h | 4 | ||||
-rw-r--r-- | WebCore/storage/StorageEvent.idl | 3 | ||||
-rw-r--r-- | WebCore/storage/StorageMap.cpp | 5 | ||||
-rw-r--r-- | WebCore/storage/StorageMap.h | 4 |
22 files changed, 95 insertions, 3 deletions
diff --git a/WebCore/storage/LocalStorage.cpp b/WebCore/storage/LocalStorage.cpp index 8b84e17..8c4cce9 100644 --- a/WebCore/storage/LocalStorage.cpp +++ b/WebCore/storage/LocalStorage.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "LocalStorage.h" +#if ENABLE(DOM_STORAGE) + #include "CString.h" #include "EventNames.h" #include "FileSystem.h" @@ -97,7 +99,7 @@ PassRefPtr<StorageArea> LocalStorage::storageArea(SecurityOrigin* origin) RefPtr<LocalStorageArea> storageArea; if (storageArea = m_storageAreaMap.get(origin)) return storageArea.release(); - + storageArea = LocalStorageArea::create(origin, this); m_storageAreaMap.set(origin, storageArea); return storageArea.release(); @@ -170,3 +172,6 @@ void LocalStorage::scheduleSync(PassRefPtr<LocalStorageArea> area) } } // namespace WebCore + +#endif // ENABLE(DOM_STORAGE) + diff --git a/WebCore/storage/LocalStorage.h b/WebCore/storage/LocalStorage.h index 1fd1f7a..393edf0 100644 --- a/WebCore/storage/LocalStorage.h +++ b/WebCore/storage/LocalStorage.h @@ -26,6 +26,8 @@ #ifndef LocalStorage_h #define LocalStorage_h +#if ENABLE(DOM_STORAGE) + #include "LocalStorageArea.h" #include "LocalStorageTask.h" #include "LocalStorageThread.h" @@ -78,4 +80,6 @@ namespace WebCore { } // namespace WebCore +#endif // ENABLE(DOM_STORAGE) + #endif // LocalStorage_h diff --git a/WebCore/storage/LocalStorageArea.cpp b/WebCore/storage/LocalStorageArea.cpp index e0900e6..bcc261c 100644 --- a/WebCore/storage/LocalStorageArea.cpp +++ b/WebCore/storage/LocalStorageArea.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "LocalStorageArea.h" +#if ENABLE(DOM_STORAGE) + #include "CString.h" #include "EventNames.h" #include "Frame.h" @@ -413,3 +415,6 @@ void LocalStorageArea::performSync() } } // namespace WebCore + +#endif // ENABLE(DOM_STORAGE) + diff --git a/WebCore/storage/LocalStorageArea.h b/WebCore/storage/LocalStorageArea.h index c6e7015..0ca5ab8 100644 --- a/WebCore/storage/LocalStorageArea.h +++ b/WebCore/storage/LocalStorageArea.h @@ -26,6 +26,8 @@ #ifndef LocalStorageArea_h #define LocalStorageArea_h +#if ENABLE(DOM_STORAGE) + #include "LocalStorageTask.h" #include "LocalStorageThread.h" @@ -102,4 +104,6 @@ namespace WebCore { } // namespace WebCore +#endif // ENABLE(DOM_STORAGE) + #endif // LocalStorageArea_h diff --git a/WebCore/storage/LocalStorageTask.cpp b/WebCore/storage/LocalStorageTask.cpp index 3d5b987..e5c42fd 100644 --- a/WebCore/storage/LocalStorageTask.cpp +++ b/WebCore/storage/LocalStorageTask.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "LocalStorageTask.h" +#if ENABLE(DOM_STORAGE) + #include "LocalStorage.h" #include "LocalStorageArea.h" #include "LocalStorageThread.h" @@ -82,3 +84,6 @@ void LocalStorageTask::performTask() } } + +#endif // ENABLE(DOM_STORAGE) + diff --git a/WebCore/storage/LocalStorageTask.h b/WebCore/storage/LocalStorageTask.h index 79063d0..d3ec315 100644 --- a/WebCore/storage/LocalStorageTask.h +++ b/WebCore/storage/LocalStorageTask.h @@ -26,6 +26,8 @@ #ifndef LocalStorageTask_h #define LocalStorageTask_h +#if ENABLE(DOM_STORAGE) + #include <wtf/PassRefPtr.h> #include <wtf/RefPtr.h> #include <wtf/Threading.h> @@ -61,4 +63,6 @@ namespace WebCore { } // namespace WebCore +#endif // ENABLE(DOM_STORAGE) + #endif // LocalStorageTask_h diff --git a/WebCore/storage/LocalStorageThread.cpp b/WebCore/storage/LocalStorageThread.cpp index da50c90..f35d44f 100644 --- a/WebCore/storage/LocalStorageThread.cpp +++ b/WebCore/storage/LocalStorageThread.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "LocalStorageThread.h" +#if ENABLE(DOM_STORAGE) + #include "LocalStorage.h" #include "LocalStorageArea.h" #include "LocalStorageTask.h" @@ -137,3 +139,6 @@ void LocalStorageThread::performTerminate() } } + +#endif // ENABLE(DOM_STORAGE) + diff --git a/WebCore/storage/LocalStorageThread.h b/WebCore/storage/LocalStorageThread.h index eb7d1ef..36f14cc 100644 --- a/WebCore/storage/LocalStorageThread.h +++ b/WebCore/storage/LocalStorageThread.h @@ -26,6 +26,8 @@ #ifndef LocalStorageThread_h #define LocalStorageThread_h +#if ENABLE(DOM_STORAGE) + #include <wtf/HashSet.h> #include <wtf/MessageQueue.h> #include <wtf/PassRefPtr.h> @@ -71,4 +73,6 @@ namespace WebCore { } // namespace WebCore +#endif // ENABLE(DOM_STORAGE) + #endif // LocalStorageThread_h diff --git a/WebCore/storage/SessionStorage.cpp b/WebCore/storage/SessionStorage.cpp index e70227a..c10a1be 100644 --- a/WebCore/storage/SessionStorage.cpp +++ b/WebCore/storage/SessionStorage.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "SessionStorage.h" +#if ENABLE(DOM_STORAGE) + #include "EventNames.h" #include "Frame.h" #include "FrameTree.h" @@ -73,3 +75,6 @@ PassRefPtr<StorageArea> SessionStorage::storageArea(SecurityOrigin* origin) } } + +#endif // ENABLE(DOM_STORAGE) + diff --git a/WebCore/storage/SessionStorage.h b/WebCore/storage/SessionStorage.h index 7b59aeb..13de203 100644 --- a/WebCore/storage/SessionStorage.h +++ b/WebCore/storage/SessionStorage.h @@ -26,6 +26,8 @@ #ifndef SessionStorage_h #define SessionStorage_h +#if ENABLE(DOM_STORAGE) + #include "SecurityOriginHash.h" #include "SessionStorageArea.h" @@ -61,4 +63,6 @@ namespace WebCore { } // namespace WebCore +#endif // ENABLE(DOM_STORAGE) + #endif // SessionStorage_h diff --git a/WebCore/storage/SessionStorageArea.cpp b/WebCore/storage/SessionStorageArea.cpp index 285922e..884208e 100644 --- a/WebCore/storage/SessionStorageArea.cpp +++ b/WebCore/storage/SessionStorageArea.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "SessionStorageArea.h" +#if ENABLE(DOM_STORAGE) + #include "EventNames.h" #include "Frame.h" #include "FrameTree.h" @@ -86,3 +88,6 @@ void SessionStorageArea::dispatchStorageEvent(const String& key, const String& o } } // namespace WebCore + +#endif // ENABLE(DOM_STORAGE) + diff --git a/WebCore/storage/SessionStorageArea.h b/WebCore/storage/SessionStorageArea.h index 3dad1af..95f425e 100644 --- a/WebCore/storage/SessionStorageArea.h +++ b/WebCore/storage/SessionStorageArea.h @@ -26,6 +26,8 @@ #ifndef SessionStorageArea_h #define SessionStorageArea_h +#if ENABLE(DOM_STORAGE) + #include "StorageArea.h" namespace WebCore { @@ -54,4 +56,6 @@ namespace WebCore { } // namespace WebCore +#endif // ENABLE(DOM_STORAGE) + #endif // SessionStorageArea_h diff --git a/WebCore/storage/Storage.cpp b/WebCore/storage/Storage.cpp index cf4413a..e228971 100644 --- a/WebCore/storage/Storage.cpp +++ b/WebCore/storage/Storage.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "Storage.h" +#if ENABLE(DOM_STORAGE) + #include "StorageArea.h" #include "PlatformString.h" #include <wtf/PassRefPtr.h> @@ -104,3 +106,6 @@ bool Storage::contains(const String& key) const } } + +#endif // ENABLE(DOM_STORAGE) + diff --git a/WebCore/storage/Storage.h b/WebCore/storage/Storage.h index 061f7c4..ca7a32e 100644 --- a/WebCore/storage/Storage.h +++ b/WebCore/storage/Storage.h @@ -26,6 +26,8 @@ #ifndef Storage_h #define Storage_h +#if ENABLE(DOM_STORAGE) + #include "StorageArea.h" #include <wtf/Forward.h> @@ -62,4 +64,6 @@ namespace WebCore { } // namespace WebCore +#endif // ENABLE(DOM_STORAGE) + #endif // Storage_h diff --git a/WebCore/storage/Storage.idl b/WebCore/storage/Storage.idl index 8ff9cd9..f2a7e9d 100644 --- a/WebCore/storage/Storage.idl +++ b/WebCore/storage/Storage.idl @@ -30,7 +30,8 @@ module storage { HasNameGetter, CustomDeleteProperty, CustomGetPropertyNames, - CustomPutFunction + CustomPutFunction, + Conditional=DOM_STORAGE ] Storage { readonly attribute [DontEnum] unsigned long length; [DontEnum] DOMString key(in unsigned long index) diff --git a/WebCore/storage/StorageArea.cpp b/WebCore/storage/StorageArea.cpp index 78b25c1..a98576d 100644 --- a/WebCore/storage/StorageArea.cpp +++ b/WebCore/storage/StorageArea.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "StorageArea.h" +#if ENABLE(DOM_STORAGE) + #include "CString.h" #include "ExceptionCode.h" #include "SecurityOrigin.h" @@ -123,3 +125,6 @@ void StorageArea::importItem(const String& key, const String& value) } } + +#endif // ENABLE(DOM_STORAGE) + diff --git a/WebCore/storage/StorageArea.h b/WebCore/storage/StorageArea.h index 2163287..9f0b83d 100644 --- a/WebCore/storage/StorageArea.h +++ b/WebCore/storage/StorageArea.h @@ -26,6 +26,8 @@ #ifndef StorageArea_h #define StorageArea_h +#if ENABLE(DOM_STORAGE) + #include "PlatformString.h" #include <wtf/Forward.h> @@ -80,4 +82,6 @@ namespace WebCore { } // namespace WebCore +#endif // ENABLE(DOM_STORAGE) + #endif // StorageArea_h diff --git a/WebCore/storage/StorageEvent.cpp b/WebCore/storage/StorageEvent.cpp index 54fd9ad..8600d3c 100644 --- a/WebCore/storage/StorageEvent.cpp +++ b/WebCore/storage/StorageEvent.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "StorageEvent.h" +#if ENABLE(DOM_STORAGE) + #include "DOMWindow.h" namespace WebCore { @@ -55,3 +57,6 @@ void StorageEvent::initStorageEvent(const AtomicString& type, bool canBubble, bo } } + +#endif // ENABLE(DOM_STORAGE) + diff --git a/WebCore/storage/StorageEvent.h b/WebCore/storage/StorageEvent.h index 1cd87c6..f523442 100644 --- a/WebCore/storage/StorageEvent.h +++ b/WebCore/storage/StorageEvent.h @@ -26,6 +26,8 @@ #ifndef StorageEvent_h #define StorageEvent_h +#if ENABLE(DOM_STORAGE) + #include "Event.h" namespace WebCore { @@ -69,4 +71,6 @@ namespace WebCore { } // namespace WebCore +#endif // ENABLE(DOM_STORAGE) + #endif // StorageEvent_h diff --git a/WebCore/storage/StorageEvent.idl b/WebCore/storage/StorageEvent.idl index 47ef67d..b5b3be5 100644 --- a/WebCore/storage/StorageEvent.idl +++ b/WebCore/storage/StorageEvent.idl @@ -26,7 +26,8 @@ module storage { interface [ - GenerateConstructor + GenerateConstructor, + Conditional=DOM_STORAGE ] StorageEvent : Event { readonly attribute DOMString key; readonly attribute [ConvertNullStringTo=Null] DOMString oldValue; diff --git a/WebCore/storage/StorageMap.cpp b/WebCore/storage/StorageMap.cpp index 880fc93..4c350c8 100644 --- a/WebCore/storage/StorageMap.cpp +++ b/WebCore/storage/StorageMap.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "StorageMap.h" +#if ENABLE(DOM_STORAGE) + namespace WebCore { PassRefPtr<StorageMap> StorageMap::create() @@ -156,3 +158,6 @@ void StorageMap::importItem(const String& key, const String& value) const } } + +#endif // ENABLE(DOM_STORAGE) + diff --git a/WebCore/storage/StorageMap.h b/WebCore/storage/StorageMap.h index d5d00a9..c6f3bc9 100644 --- a/WebCore/storage/StorageMap.h +++ b/WebCore/storage/StorageMap.h @@ -26,6 +26,8 @@ #ifndef StorageMap_h #define StorageMap_h +#if ENABLE(DOM_STORAGE) + #include "PlatformString.h" #include "StringHash.h" @@ -62,4 +64,6 @@ namespace WebCore { } // namespace WebCore +#endif // ENABLE(DOM_STORAGE) + #endif // StorageMap_h |