Always enable ENABLE(DOM_STORAGE)
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 16 Oct 2011 10:28:50 +0000 (10:28 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 16 Oct 2011 10:28:50 +0000 (10:28 +0000)
https://bugs.webkit.org/show_bug.cgi?id=70189

Reviewed by Eric Seidel.

.:

* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsWinCE.cmake:
* Source/cmakeconfig.h.cmake:
* configure.ac:

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

As discussed on webkit-dev, we are reducing the complexity of WebKit by
removing unnecessary configuration options.  DOMStorage is not a core
part of the web platform.  It should always be enabled.

* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* GNUmakefile.am:
* GNUmakefile.list.am:
* UseJSC.cmake:
* WebCore.exp.in:
* WebCore.pro:
* bindings/js/JSEventCustom.cpp:
* bindings/js/JSInjectedScriptHostCustom.cpp:
* bindings/js/JSStorageCustom.cpp:
* bindings/v8/custom/V8EventCustom.cpp:
(WebCore::toV8):
* bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
(WebCore::V8InjectedScriptHost::storageIdCallback):
* bindings/v8/custom/V8StorageCustom.cpp:
* dom/Document.cpp:
(WebCore::Document::createEvent):
* dom/Event.cpp:
(WebCore::Event::isStorageEvent):
* dom/Event.h:
* dom/Node.cpp:
* features.pri:
* inspector/InjectedScriptHost.cpp:
(WebCore::InjectedScriptHost::InjectedScriptHost):
(WebCore::InjectedScriptHost::disconnect):
(WebCore::InjectedScriptHost::storageIdImpl):
* inspector/InjectedScriptHost.h:
(WebCore::InjectedScriptHost::init):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::connectFrontend):
(WebCore::InspectorController::disconnectFrontend):
(WebCore::InspectorController::restoreInspectorStateFromCookie):
* inspector/InspectorController.h:
* inspector/InspectorDOMStorageAgent.cpp:
* inspector/InspectorDOMStorageResource.cpp:
* inspector/InspectorDOMStorageResource.h:
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didCommitLoadImpl):
(WebCore::InspectorInstrumentation::didUseDOMStorageImpl):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::didUseDOMStorage):
* inspector/InstrumentingAgents.h:
(WebCore::InstrumentingAgents::InstrumentingAgents):
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
(WebCore::WorkerInspectorController::connectFrontend):
* inspector/generate-inspector-idl:
* page/Chrome.cpp:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::~DOMWindow):
(WebCore::DOMWindow::clear):
(WebCore::DOMWindow::localStorage):
* page/DOMWindow.h:
* page/DOMWindow.idl:
* page/Navigator.cpp:
(WebCore::Navigator::getStorageUpdates):
* page/Navigator.h:
* page/Navigator.idl:
* page/Page.cpp:
* page/Page.h:
* page/PageGroup.cpp:
(WebCore::PageGroup::closeLocalStorage):
* page/PageGroup.h:
* page/Settings.cpp:
(WebCore::Settings::Settings):
(WebCore::Settings::setSessionStorageQuota):
* page/Settings.h:
(WebCore::Settings::sessionStorageQuota):
* storage/LocalStorageTask.cpp:
* storage/LocalStorageTask.h:
* storage/LocalStorageThread.cpp:
* storage/LocalStorageThread.h:
* storage/Storage.cpp:
* storage/Storage.h:
* storage/Storage.idl:
* storage/StorageArea.h:
* storage/StorageAreaImpl.cpp:
* storage/StorageAreaImpl.h:
* storage/StorageAreaSync.cpp:
(WebCore::StorageAreaSync::scheduleSync):
* storage/StorageAreaSync.h:
* storage/StorageEvent.cpp:
* storage/StorageEvent.h:
* storage/StorageEvent.idl:
* storage/StorageEventDispatcher.cpp:
* storage/StorageEventDispatcher.h:
* storage/StorageMap.cpp:
* storage/StorageMap.h:
* storage/StorageNamespace.cpp:
* storage/StorageNamespace.h:
* storage/StorageNamespaceImpl.cpp:
* storage/StorageNamespaceImpl.h:
* storage/StorageSyncManager.cpp:
(WebCore::StorageSyncManager::scheduleDeleteEmptyDatabase):
* storage/StorageSyncManager.h:
* storage/StorageTracker.cpp:
* storage/StorageTracker.h:

Source/WebKit/chromium:

* features.gypi:
* src/StorageAreaProxy.cpp:
* src/StorageAreaProxy.h:
* src/StorageEventDispatcherChromium.cpp:
* src/StorageEventDispatcherImpl.cpp:
* src/StorageEventDispatcherImpl.h:
* src/StorageNamespaceProxy.cpp:
* src/StorageNamespaceProxy.h:
* src/WebRuntimeFeatures.cpp:
(WebKit::WebRuntimeFeatures::enableLocalStorage):
(WebKit::WebRuntimeFeatures::isLocalStorageEnabled):
(WebKit::WebRuntimeFeatures::enableSessionStorage):
(WebKit::WebRuntimeFeatures::isSessionStorageEnabled):
* src/WebStorageAreaImpl.cpp:
* src/WebStorageAreaImpl.h:
* src/WebStorageEventDispatcherImpl.cpp:
* src/WebStorageEventDispatcherImpl.h:
* src/WebStorageNamespaceImpl.cpp:
* src/WebStorageNamespaceImpl.h:

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:
* Storage/WebStorageManager.mm:
* Storage/WebStorageManagerInternal.h:
* Storage/WebStorageTrackerClient.h:
* Storage/WebStorageTrackerClient.mm:
(WebStorageTrackerClient::dispatchDidModifyOrigin):
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):

Tools:

* Scripts/build-webkit:
* waf/build/settings.py:

WebKitLibraries:

* win/tools/vsprops/FeatureDefines.vsprops:
* win/tools/vsprops/FeatureDefinesCairo.vsprops:

LayoutTests:

* fast/events/event-creation.html:

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

113 files changed:
ChangeLog
LayoutTests/ChangeLog
LayoutTests/fast/events/event-creation.html
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
Source/WebCore/UseJSC.cmake
Source/WebCore/WebCore.exp.in
Source/WebCore/WebCore.pro
Source/WebCore/bindings/js/JSEventCustom.cpp
Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp
Source/WebCore/bindings/js/JSStorageCustom.cpp
Source/WebCore/bindings/v8/custom/V8EventCustom.cpp
Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
Source/WebCore/bindings/v8/custom/V8StorageCustom.cpp
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/Event.cpp
Source/WebCore/dom/Event.h
Source/WebCore/dom/Node.cpp
Source/WebCore/features.pri
Source/WebCore/inspector/InjectedScriptHost.cpp
Source/WebCore/inspector/InjectedScriptHost.h
Source/WebCore/inspector/InspectorController.cpp
Source/WebCore/inspector/InspectorController.h
Source/WebCore/inspector/InspectorDOMStorageAgent.cpp
Source/WebCore/inspector/InspectorDOMStorageResource.cpp
Source/WebCore/inspector/InspectorDOMStorageResource.h
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InspectorInstrumentation.h
Source/WebCore/inspector/InstrumentingAgents.h
Source/WebCore/inspector/WorkerInspectorController.cpp
Source/WebCore/inspector/generate-inspector-idl
Source/WebCore/page/Chrome.cpp
Source/WebCore/page/DOMWindow.cpp
Source/WebCore/page/DOMWindow.h
Source/WebCore/page/DOMWindow.idl
Source/WebCore/page/Navigator.cpp
Source/WebCore/page/Navigator.h
Source/WebCore/page/Navigator.idl
Source/WebCore/page/Page.cpp
Source/WebCore/page/Page.h
Source/WebCore/page/PageGroup.cpp
Source/WebCore/page/PageGroup.h
Source/WebCore/page/Settings.cpp
Source/WebCore/page/Settings.h
Source/WebCore/storage/LocalStorageTask.cpp
Source/WebCore/storage/LocalStorageTask.h
Source/WebCore/storage/LocalStorageThread.cpp
Source/WebCore/storage/LocalStorageThread.h
Source/WebCore/storage/Storage.cpp
Source/WebCore/storage/Storage.h
Source/WebCore/storage/Storage.idl
Source/WebCore/storage/StorageArea.h
Source/WebCore/storage/StorageAreaImpl.cpp
Source/WebCore/storage/StorageAreaImpl.h
Source/WebCore/storage/StorageAreaSync.cpp
Source/WebCore/storage/StorageAreaSync.h
Source/WebCore/storage/StorageEvent.cpp
Source/WebCore/storage/StorageEvent.h
Source/WebCore/storage/StorageEvent.idl
Source/WebCore/storage/StorageEventDispatcher.cpp
Source/WebCore/storage/StorageEventDispatcher.h
Source/WebCore/storage/StorageMap.cpp
Source/WebCore/storage/StorageMap.h
Source/WebCore/storage/StorageNamespace.cpp
Source/WebCore/storage/StorageNamespace.h
Source/WebCore/storage/StorageNamespaceImpl.cpp
Source/WebCore/storage/StorageNamespaceImpl.h
Source/WebCore/storage/StorageSyncManager.cpp
Source/WebCore/storage/StorageSyncManager.h
Source/WebCore/storage/StorageTracker.cpp
Source/WebCore/storage/StorageTracker.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/features.gypi
Source/WebKit/chromium/src/StorageAreaProxy.cpp
Source/WebKit/chromium/src/StorageAreaProxy.h
Source/WebKit/chromium/src/StorageEventDispatcherChromium.cpp
Source/WebKit/chromium/src/StorageEventDispatcherImpl.cpp
Source/WebKit/chromium/src/StorageEventDispatcherImpl.h
Source/WebKit/chromium/src/StorageNamespaceProxy.cpp
Source/WebKit/chromium/src/StorageNamespaceProxy.h
Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
Source/WebKit/chromium/src/WebStorageAreaImpl.cpp
Source/WebKit/chromium/src/WebStorageAreaImpl.h
Source/WebKit/chromium/src/WebStorageEventDispatcherImpl.cpp
Source/WebKit/chromium/src/WebStorageEventDispatcherImpl.h
Source/WebKit/chromium/src/WebStorageNamespaceImpl.cpp
Source/WebKit/chromium/src/WebStorageNamespaceImpl.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit/mac/Storage/WebStorageManager.mm
Source/WebKit/mac/Storage/WebStorageManagerInternal.h
Source/WebKit/mac/Storage/WebStorageTrackerClient.h
Source/WebKit/mac/Storage/WebStorageTrackerClient.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebProcess.cpp
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsWinCE.cmake
Source/cmakeconfig.h.cmake
Tools/ChangeLog
Tools/Scripts/build-webkit
Tools/waf/build/settings.py
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
configure.ac

index 4972ef8..f43cbd3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-10-16  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(DOM_STORAGE)
+        https://bugs.webkit.org/show_bug.cgi?id=70189
+
+        Reviewed by Eric Seidel.
+
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/OptionsWinCE.cmake:
+        * Source/cmakeconfig.h.cmake:
+        * configure.ac:
+
 2011-10-15  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 
         [Qt] [Symbian] Remove support for the Symbian platform for the QtWebKit port
index 1d474f7..3f1f5c3 100644 (file)
@@ -1,3 +1,12 @@
+2011-10-16  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(DOM_STORAGE)
+        https://bugs.webkit.org/show_bug.cgi?id=70189
+
+        Reviewed by Eric Seidel.
+
+        * fast/events/event-creation.html:
+
 2011-10-15  Erik Arvidsson  <arv@chromium.org>
 
         JS Test Harness: Make console and description elements optional in the HTML
index dfd4191..9c741bc 100644 (file)
     shouldBeTrue("document.createEvent('XMLHttpRequestProgressEvent') instanceof window.Event");
     shouldBeTrue("document.createEvent('XMLHttpRequestProgressEvent').constructor === window.XMLHttpRequestProgressEvent");
 
-    // #if ENABLE(DOM_STORAGE)
     // StorageEvent
     shouldBeTrue("document.createEvent('StorageEvent') instanceof window.StorageEvent");
     shouldBeTrue("document.createEvent('StorageEvent') instanceof window.Event");
index ece94e5..d2ef9fd 100644 (file)
@@ -1,3 +1,12 @@
+2011-10-16  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(DOM_STORAGE)
+        https://bugs.webkit.org/show_bug.cgi?id=70189
+
+        Reviewed by Eric Seidel.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-10-15  Dan HorĂ¡k <dan@danny.cz>
 
         The s390 and s390x architectures both use 64-bit double type
index 57e6d92..6ddbbf9 100644 (file)
@@ -81,7 +81,6 @@ ENABLE_DATA_TRANSFER_ITEMS = ;
 ENABLE_DETAILS = ENABLE_DETAILS;
 ENABLE_DEVICE_ORIENTATION = ;
 ENABLE_DIRECTORY_UPLOAD = ;
-ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
 ENABLE_FILE_SYSTEM = ;
 ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
 ENABLE_GAMEPAD = ;
@@ -116,4 +115,4 @@ ENABLE_WORKERS = ENABLE_WORKERS;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
index e064ea4..82925ea 100644 (file)
@@ -355,6 +355,8 @@ SET(WebCore_IDL_FILES
     plugins/DOMPlugin.idl
     plugins/DOMPluginArray.idl
 
+    storage/Storage.idl
+    storage/StorageEvent.idl
     storage/StorageInfo.idl
     storage/StorageInfoErrorCallback.idl
     storage/StorageInfoQuotaCallback.idl
@@ -1474,13 +1476,6 @@ IF (ENABLE_INDEXED_DATABASE)
     )
 ENDIF ()
 
-IF (ENABLE_DOM_STORAGE)
-    LIST(APPEND WebCore_IDL_FILES
-        storage/Storage.idl
-        storage/StorageEvent.idl
-    )
-ENDIF ()
-
 IF (WTF_USE_LEVELDB)
     LIST(APPEND WebCore_SOURCES
         platform/leveldb/LevelDBDatabase.cpp
index baa7ac1..7fb0afc 100644 (file)
@@ -1,3 +1,113 @@
+2011-10-16  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(DOM_STORAGE)
+        https://bugs.webkit.org/show_bug.cgi?id=70189
+
+        Reviewed by Eric Seidel.
+
+        As discussed on webkit-dev, we are reducing the complexity of WebKit by
+        removing unnecessary configuration options.  DOMStorage is not a core
+        part of the web platform.  It should always be enabled.
+
+        * CMakeLists.txt:
+        * Configurations/FeatureDefines.xcconfig:
+        * GNUmakefile.am:
+        * GNUmakefile.list.am:
+        * UseJSC.cmake:
+        * WebCore.exp.in:
+        * WebCore.pro:
+        * bindings/js/JSEventCustom.cpp:
+        * bindings/js/JSInjectedScriptHostCustom.cpp:
+        * bindings/js/JSStorageCustom.cpp:
+        * bindings/v8/custom/V8EventCustom.cpp:
+        (WebCore::toV8):
+        * bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
+        (WebCore::V8InjectedScriptHost::storageIdCallback):
+        * bindings/v8/custom/V8StorageCustom.cpp:
+        * dom/Document.cpp:
+        (WebCore::Document::createEvent):
+        * dom/Event.cpp:
+        (WebCore::Event::isStorageEvent):
+        * dom/Event.h:
+        * dom/Node.cpp:
+        * features.pri:
+        * inspector/InjectedScriptHost.cpp:
+        (WebCore::InjectedScriptHost::InjectedScriptHost):
+        (WebCore::InjectedScriptHost::disconnect):
+        (WebCore::InjectedScriptHost::storageIdImpl):
+        * inspector/InjectedScriptHost.h:
+        (WebCore::InjectedScriptHost::init):
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        (WebCore::InspectorController::connectFrontend):
+        (WebCore::InspectorController::disconnectFrontend):
+        (WebCore::InspectorController::restoreInspectorStateFromCookie):
+        * inspector/InspectorController.h:
+        * inspector/InspectorDOMStorageAgent.cpp:
+        * inspector/InspectorDOMStorageResource.cpp:
+        * inspector/InspectorDOMStorageResource.h:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+        (WebCore::InspectorInstrumentation::didUseDOMStorageImpl):
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::didUseDOMStorage):
+        * inspector/InstrumentingAgents.h:
+        (WebCore::InstrumentingAgents::InstrumentingAgents):
+        * inspector/WorkerInspectorController.cpp:
+        (WebCore::WorkerInspectorController::WorkerInspectorController):
+        (WebCore::WorkerInspectorController::connectFrontend):
+        * inspector/generate-inspector-idl:
+        * page/Chrome.cpp:
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::~DOMWindow):
+        (WebCore::DOMWindow::clear):
+        (WebCore::DOMWindow::localStorage):
+        * page/DOMWindow.h:
+        * page/DOMWindow.idl:
+        * page/Navigator.cpp:
+        (WebCore::Navigator::getStorageUpdates):
+        * page/Navigator.h:
+        * page/Navigator.idl:
+        * page/Page.cpp:
+        * page/Page.h:
+        * page/PageGroup.cpp:
+        (WebCore::PageGroup::closeLocalStorage):
+        * page/PageGroup.h:
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        (WebCore::Settings::setSessionStorageQuota):
+        * page/Settings.h:
+        (WebCore::Settings::sessionStorageQuota):
+        * storage/LocalStorageTask.cpp:
+        * storage/LocalStorageTask.h:
+        * storage/LocalStorageThread.cpp:
+        * storage/LocalStorageThread.h:
+        * storage/Storage.cpp:
+        * storage/Storage.h:
+        * storage/Storage.idl:
+        * storage/StorageArea.h:
+        * storage/StorageAreaImpl.cpp:
+        * storage/StorageAreaImpl.h:
+        * storage/StorageAreaSync.cpp:
+        (WebCore::StorageAreaSync::scheduleSync):
+        * storage/StorageAreaSync.h:
+        * storage/StorageEvent.cpp:
+        * storage/StorageEvent.h:
+        * storage/StorageEvent.idl:
+        * storage/StorageEventDispatcher.cpp:
+        * storage/StorageEventDispatcher.h:
+        * storage/StorageMap.cpp:
+        * storage/StorageMap.h:
+        * storage/StorageNamespace.cpp:
+        * storage/StorageNamespace.h:
+        * storage/StorageNamespaceImpl.cpp:
+        * storage/StorageNamespaceImpl.h:
+        * storage/StorageSyncManager.cpp:
+        (WebCore::StorageSyncManager::scheduleDeleteEmptyDatabase):
+        * storage/StorageSyncManager.h:
+        * storage/StorageTracker.cpp:
+        * storage/StorageTracker.h:
+
 2011-10-15  Adam Barth  <abarth@webkit.org>
 
         Rename ENABLE(SKIA_TEXT) to USE(SKIA_TEXT)
index 54817e7..a276c67 100644 (file)
@@ -79,7 +79,6 @@ ENABLE_DATA_TRANSFER_ITEMS = ;
 ENABLE_DETAILS = ENABLE_DETAILS;
 ENABLE_DEVICE_ORIENTATION = ;
 ENABLE_DIRECTORY_UPLOAD = ;
-ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
 ENABLE_FILE_SYSTEM = ;
 ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
 ENABLE_GAMEPAD = ;
@@ -115,4 +114,4 @@ ENABLE_WORKERS = ENABLE_WORKERS;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
index fc32c51..0d7a1f0 100644 (file)
@@ -237,14 +237,6 @@ webcore_cppflags += -DENABLE_MUTATION_OBSERVERS=1
 endif # END ENABLE_MUTATION_OBSERVERS
 
 # ----
-# HTML5 client-side session and persistent storage
-# ----
-if ENABLE_DOM_STORAGE
-FEATURE_DEFINES += ENABLE_DOM_STORAGE=1
-webcore_cppflags += -DENABLE_DOM_STORAGE=1
-endif # END ENABLE_DOM_STORAGE
-
-# ----
 # FileSystem API support
 # ----
 if ENABLE_FILE_SYSTEM
index 14ac169..8015ccc 100644 (file)
@@ -466,7 +466,10 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSSQLStatementErrorCallback.cpp \
        DerivedSources/WebCore/JSSQLTransaction.h \
        DerivedSources/WebCore/JSSQLTransactionSync.h \
+       DerivedSources/WebCore/JSStorage.cpp \
        DerivedSources/WebCore/JSStorage.h \
+       DerivedSources/WebCore/JSStorageEvent.cpp \
+       DerivedSources/WebCore/JSStorageEvent.h \
        DerivedSources/WebCore/JSStorageInfo.h \
        DerivedSources/WebCore/JSStorageInfoErrorCallback.h \
        DerivedSources/WebCore/JSStorageInfoQuotaCallback.h \
@@ -4219,16 +4222,6 @@ webcore_built_sources += \
 endif # END ENABLE_INDEXED_DATABASE
 
 # ----
-# HTML5 client-side session and persistent storage
-# ----
-if ENABLE_DOM_STORAGE
-webcore_built_sources += \
-       DerivedSources/WebCore/JSStorage.cpp \
-       DerivedSources/WebCore/JSStorageEvent.cpp \
-       DerivedSources/WebCore/JSStorageEvent.h
-endif # END ENABLE_DOM_STORAGE
-
-# ----
 # FileSystem API support
 # ----
 if ENABLE_FILE_SYSTEM
index ca2e472..6bfb4b9 100644 (file)
@@ -109,6 +109,7 @@ LIST(APPEND WebCore_SOURCES
     bindings/js/JSPopStateEventCustom.cpp
     bindings/js/JSProcessingInstructionCustom.cpp
     bindings/js/JSScriptProfileNodeCustom.cpp
+    bindings/js/JSStorageCustom.cpp
     bindings/js/JSStyleSheetCustom.cpp
     bindings/js/JSStyleSheetListCustom.cpp
     bindings/js/JSTextCustom.cpp
@@ -177,12 +178,6 @@ IF (ENABLE_SQL_DATABASE)
     )
 ENDIF ()
 
-IF (ENABLE_DOM_STORAGE)
-    LIST(APPEND WebCore_SOURCES
-        bindings/js/JSStorageCustom.cpp
-    )
-ENDIF ()
-
 IF (ENABLE_INDEXED_DATABASE)
     LIST(APPEND WebCore_SOURCES
         bindings/js/IDBBindingUtilities.cpp
index 78652d6..9fb9267 100644 (file)
@@ -391,6 +391,15 @@ __ZN7WebCore14SecurityOrigin32removeOriginAccessWhitelistEntryERKS0_RKN3WTF6Stri
 __ZN7WebCore14SecurityOrigin40setDomainRelaxationForbiddenForURLSchemeEbRKN3WTF6StringE
 __ZN7WebCore14SecurityOrigin6createERKN3WTF6StringES4_i
 __ZN7WebCore14SecurityOrigin6createERKNS_4KURLEi
+__ZN7WebCore14StorageTracker7originsERN3WTF6VectorINS1_6RefPtrINS_14SecurityOriginEEELm0EEE
+__ZN7WebCore14StorageTracker7trackerEv
+__ZN7WebCore14StorageTracker9setClientEPNS_20StorageTrackerClientE
+__ZN7WebCore14StorageTracker12deleteOriginEPNS_14SecurityOriginE
+__ZN7WebCore14StorageTracker16deleteAllOriginsEv
+__ZN7WebCore14StorageTracker16syncLocalStorageEv
+__ZN7WebCore14StorageTracker17initializeTrackerERKN3WTF6StringEPNS_20StorageTrackerClientE
+__ZN7WebCore14StorageTracker18diskUsageForOriginEPNS_14SecurityOriginE
+__ZN7WebCore14StorageTracker32syncFileSystemAndTrackerDatabaseEv
 __ZN7WebCore14endOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE
 __ZN7WebCore15ArchiveResource6createEN3WTF10PassRefPtrINS_12SharedBufferEEERKNS_4KURLERKNS1_6StringESA_SA_RKNS_16ResourceResponseE
 __ZN7WebCore15DOMWrapperWorld13clearWrappersEv
@@ -1495,18 +1504,6 @@ _wkSignedPublicKeyAndChallengeString
 _wkWindowSetAlpha
 _wkWindowSetScaledFrame
 
-#if ENABLE(DOM_STORAGE)
-__ZN7WebCore14StorageTracker7originsERN3WTF6VectorINS1_6RefPtrINS_14SecurityOriginEEELm0EEE
-__ZN7WebCore14StorageTracker7trackerEv
-__ZN7WebCore14StorageTracker9setClientEPNS_20StorageTrackerClientE
-__ZN7WebCore14StorageTracker12deleteOriginEPNS_14SecurityOriginE
-__ZN7WebCore14StorageTracker16deleteAllOriginsEv
-__ZN7WebCore14StorageTracker16syncLocalStorageEv
-__ZN7WebCore14StorageTracker17initializeTrackerERKN3WTF6StringEPNS_20StorageTrackerClientE
-__ZN7WebCore14StorageTracker18diskUsageForOriginEPNS_14SecurityOriginE
-__ZN7WebCore14StorageTracker32syncFileSystemAndTrackerDatabaseEv
-#endif
-
 #if !defined(NDEBUG)
 __ZN7WebCore20LogNotYetImplementedE
 #endif
index 5e38151..013458d 100644 (file)
@@ -332,6 +332,7 @@ v8 {
         bindings/js/JSPopStateEventCustom.cpp \
         bindings/js/JSProcessingInstructionCustom.cpp \
         bindings/js/JSScriptProfileNodeCustom.cpp \
+        bindings/js/JSStorageCustom.cpp \
         bindings/js/JSStyleSheetCustom.cpp \
         bindings/js/JSStyleSheetListCustom.cpp \
         bindings/js/JSTextCustom.cpp \
@@ -1221,6 +1222,18 @@ SOURCES += \
     rendering/style/StyleSurroundData.cpp \
     rendering/style/StyleTransformData.cpp \
     rendering/style/StyleVisualData.cpp \
+    storage/LocalStorageTask.cpp \
+    storage/LocalStorageThread.cpp \
+    storage/Storage.cpp \
+    storage/StorageAreaImpl.cpp \
+    storage/StorageAreaSync.cpp \
+    storage/StorageEvent.cpp \
+    storage/StorageEventDispatcher.cpp \
+    storage/StorageMap.cpp \
+    storage/StorageNamespace.cpp \
+    storage/StorageNamespaceImpl.cpp \
+    storage/StorageSyncManager.cpp \
+    storage/StorageTracker.cpp \
     testing/Internals.cpp \
     xml/DOMParser.cpp \
     xml/XMLHttpRequest.cpp \
@@ -2353,6 +2366,41 @@ HEADERS += \
     rendering/svg/SVGTextMetrics.h \
     rendering/svg/SVGTextQuery.h \
     rendering/svg/SVGTextRunRenderingContext.h \
+    storage/AbstractDatabase.h \
+    storage/ChangeVersionWrapper.h \
+    storage/DatabaseAuthorizer.h \
+    storage/Database.h \
+    storage/DatabaseCallback.h \
+    storage/DatabaseSync.h \
+    storage/DatabaseTask.h \
+    storage/DatabaseThread.h \
+    storage/DatabaseTracker.h \
+    storage/LocalStorageTask.h \
+    storage/LocalStorageThread.h \
+    storage/OriginQuotaManager.h \
+    storage/OriginUsageRecord.h \
+    storage/SQLCallbackWrapper.h \
+    storage/SQLResultSet.h \
+    storage/SQLResultSetRowList.h \
+    storage/SQLStatement.h \
+    storage/SQLStatementSync.h \
+    storage/SQLTransaction.h \
+    storage/SQLTransactionClient.h \
+    storage/SQLTransactionCoordinator.h \
+    storage/SQLTransactionSync.h \
+    storage/SQLTransactionSyncCallback.h \
+    storage/StorageArea.h \
+    storage/StorageAreaImpl.h \
+    storage/StorageAreaSync.h \
+    storage/StorageEvent.h \
+    storage/StorageEventDispatcher.h \
+    storage/Storage.h \
+    storage/StorageMap.h \
+    storage/StorageNamespace.h \
+    storage/StorageNamespaceImpl.h \
+    storage/StorageSyncManager.h \
+    storage/StorageTracker.h \
+    storage/StorageTrackerClient.h \
     svg/animation/SMILTimeContainer.h \
     svg/animation/SMILTime.h \
     svg/animation/SVGSMILElement.h \
@@ -2862,63 +2910,6 @@ contains(DEFINES, ENABLE_DATA_TRANSFER_ITEMS=1) {
         platform/qt/DataTransferItemsQt.cpp
 }
 
-contains(DEFINES, ENABLE_DOM_STORAGE=1) {
-    HEADERS += \
-        storage/AbstractDatabase.h \
-        storage/ChangeVersionWrapper.h \
-        storage/DatabaseAuthorizer.h \
-        storage/Database.h \
-        storage/DatabaseCallback.h \
-        storage/DatabaseSync.h \
-        storage/DatabaseTask.h \
-        storage/DatabaseThread.h \
-        storage/DatabaseTracker.h \
-        storage/LocalStorageTask.h \
-        storage/LocalStorageThread.h \
-        storage/OriginQuotaManager.h \
-        storage/OriginUsageRecord.h \
-        storage/SQLCallbackWrapper.h \
-        storage/SQLResultSet.h \
-        storage/SQLResultSetRowList.h \
-        storage/SQLStatement.h \
-        storage/SQLStatementSync.h \
-        storage/SQLTransaction.h \
-        storage/SQLTransactionClient.h \
-        storage/SQLTransactionCoordinator.h \
-        storage/SQLTransactionSync.h \
-        storage/SQLTransactionSyncCallback.h \
-        storage/StorageArea.h \
-        storage/StorageAreaImpl.h \
-        storage/StorageAreaSync.h \
-        storage/StorageEvent.h \
-        storage/StorageEventDispatcher.h \
-        storage/Storage.h \
-        storage/StorageMap.h \
-        storage/StorageNamespace.h \
-        storage/StorageNamespaceImpl.h \
-        storage/StorageSyncManager.h \
-        storage/StorageTracker.h \
-        storage/StorageTrackerClient.h
-
-    !v8 {
-        SOURCES += \
-            bindings/js/JSStorageCustom.cpp
-    }
-    SOURCES += \
-        storage/LocalStorageTask.cpp \
-        storage/LocalStorageThread.cpp \
-        storage/Storage.cpp \
-        storage/StorageAreaImpl.cpp \
-        storage/StorageAreaSync.cpp \
-        storage/StorageEvent.cpp \
-        storage/StorageEventDispatcher.cpp \
-        storage/StorageMap.cpp \
-        storage/StorageNamespace.cpp \
-        storage/StorageNamespaceImpl.cpp \
-        storage/StorageSyncManager.cpp \
-        storage/StorageTracker.cpp
-}
-
 contains(DEFINES, ENABLE_FILE_SYSTEM=1) {
     HEADERS += \
         fileapi/AsyncFileWriter.h \
index 9958cb6..fde60b1 100644 (file)
@@ -52,6 +52,7 @@
 #include "JSPopStateEvent.h"
 #include "JSProgressEvent.h"
 #include "JSSpeechInputEvent.h"
+#include "JSStorageEvent.h"
 #include "JSTextEvent.h"
 #include "JSUIEvent.h"
 #include "JSWebKitAnimationEvent.h"
@@ -70,6 +71,7 @@
 #include "PopStateEvent.h"
 #include "ProgressEvent.h"
 #include "SpeechInputEvent.h"
+#include "StorageEvent.h"
 #include "TextEvent.h"
 #include "UIEvent.h"
 #include "WebKitAnimationEvent.h"
 #include "XMLHttpRequestProgressEvent.h"
 #include <runtime/JSLock.h>
 
-#if ENABLE(DOM_STORAGE)
-#include "JSStorageEvent.h"
-#include "StorageEvent.h"
-#endif
-
 #if ENABLE(SVG)
 #include "JSSVGZoomEvent.h"
 #include "SVGZoomEvent.h"
@@ -176,10 +173,8 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, Event* event)
             wrapper = CREATE_DOM_WRAPPER(exec, globalObject, ProgressEvent, event);
     } else if (event->isBeforeLoadEvent())
         wrapper = CREATE_DOM_WRAPPER(exec, globalObject, BeforeLoadEvent, event);
-#if ENABLE(DOM_STORAGE)
     else if (event->isStorageEvent())
         wrapper = CREATE_DOM_WRAPPER(exec, globalObject, StorageEvent, event);
-#endif
 #if ENABLE(INDEXED_DATABASE)
     else if (event->isIDBVersionChangeEvent())
         wrapper = CREATE_DOM_WRAPPER(exec, globalObject, IDBVersionChangeEvent, event);
index 8c2c13e..4755793 100644 (file)
 #include "JSHTMLCollection.h"
 #include "JSNode.h"
 #include "JSNodeList.h"
+#include "JSStorage.h"
 #include "ScriptValue.h"
-#if ENABLE(DOM_STORAGE)
 #include "Storage.h"
-#include "JSStorage.h"
-#endif
 #include <runtime/DateInstance.h>
 #include <runtime/Error.h>
 #include <runtime/JSArray.h>
@@ -183,11 +181,9 @@ JSValue JSInjectedScriptHost::storageId(ExecState* exec)
 {
     if (exec->argumentCount() < 1)
         return jsUndefined();
-#if ENABLE(DOM_STORAGE)
     Storage* storage = toStorage(exec->argument(0));
     if (storage)
         return jsNumber(impl()->storageIdImpl(storage));
-#endif
     return jsUndefined();
 }
 
index 2e1192f..ee266f9 100644 (file)
@@ -24,9 +24,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(DOM_STORAGE)
-
 #include "JSStorageCustom.h"
 
 #include "PlatformString.h"
@@ -99,5 +96,3 @@ bool JSStorage::putDelegate(ExecState* exec, const Identifier& propertyName, JSV
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(DOM_STORAGE)
index ec3aae0..bcf7d6f 100644 (file)
@@ -156,10 +156,8 @@ v8::Handle<v8::Value> toV8(Event* impl)
     if (impl->isErrorEvent())
         return toV8(static_cast<ErrorEvent*>(impl));
 #endif
-#if ENABLE(DOM_STORAGE)
     if (impl->isStorageEvent())
         return toV8(static_cast<StorageEvent*>(impl));
-#endif
 #if ENABLE(INDEXED_DATABASE)
     if (impl->isIDBVersionChangeEvent())
         return toV8(static_cast<IDBVersionChangeEvent*>(impl));
index 8c54b81..515f216 100644 (file)
@@ -182,13 +182,11 @@ v8::Handle<v8::Value> V8InjectedScriptHost::storageIdCallback(const v8::Argument
 {
     if (args.Length() < 1)
         return v8::Undefined();
-#if ENABLE(DOM_STORAGE)
     INC_STATS("InjectedScriptHost.storageId()");
     InjectedScriptHost* host = V8InjectedScriptHost::toNative(args.Holder());
     Storage* storage = V8Storage::toNative(v8::Handle<v8::Object>::Cast(args[0]));
     if (storage)
         return v8::Number::New(host->storageIdImpl(storage));
-#endif
     return v8::Undefined();
 }
 
index a252410..cd66476 100644 (file)
@@ -29,8 +29,6 @@
 */
 
 #include "config.h"
-
-#if ENABLE(DOM_STORAGE)
 #include "V8Storage.h"
 
 #include "Storage.h"
@@ -153,5 +151,3 @@ v8::Handle<v8::Boolean> V8Storage::namedPropertyDeleter(v8::Local<v8::String> na
 }
 
 } // namespace WebCore
-
-#endif
index 7758c31..5703c26 100644 (file)
 #include "Settings.h"
 #include "ShadowRoot.h"
 #include "StaticHashSetNodeList.h"
+#include "StorageEvent.h"
 #include "StyleSheetList.h"
 #include "TextEvent.h"
 #include "TextResourceDecoder.h"
 #include "SharedWorkerRepository.h"
 #endif
 
-#if ENABLE(DOM_STORAGE)
-#include "StorageEvent.h"
-#endif
-
 #if ENABLE(XPATH)
 #include "XPathEvaluator.h"
 #include "XPathExpression.h"
@@ -3556,10 +3553,8 @@ PassRefPtr<Event> Document::createEvent(const String& eventType, ExceptionCode&
     else if (eventType == "WebGLContextEvent")
         event = WebGLContextEvent::create();
 #endif
-#if ENABLE(DOM_STORAGE)
     else if (eventType == "StorageEvent")
         event = StorageEvent::create();
-#endif
 #if ENABLE(SVG)
     else if (eventType == "SVGEvents")
         event = Event::create();
index ffd04de..119d991 100644 (file)
@@ -208,12 +208,10 @@ bool Event::isSVGZoomEvent() const
 }
 #endif
 
-#if ENABLE(DOM_STORAGE)
 bool Event::isStorageEvent() const
 {
     return false;
 }
-#endif
 
 #if ENABLE(INDEXED_DATABASE)
 bool Event::isIDBVersionChangeEvent() const
index 0ad7913..1628be8 100644 (file)
@@ -136,9 +136,7 @@ namespace WebCore {
 #if ENABLE(SVG)
         virtual bool isSVGZoomEvent() const;
 #endif
-#if ENABLE(DOM_STORAGE)
         virtual bool isStorageEvent() const;
-#endif
 #if ENABLE(INDEXED_DATABASE)
         virtual bool isIDBVersionChangeEvent() const;
 #endif
index ca0d2c4..f5e47f4 100644 (file)
@@ -84,6 +84,7 @@
 #include "SelectorQuery.h"
 #include "ShadowRoot.h"
 #include "StaticNodeList.h"
+#include "StorageEvent.h"
 #include "TagNodeList.h"
 #include "Text.h"
 #include "TextEvent.h"
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 
-#if ENABLE(DOM_STORAGE)
-#include "StorageEvent.h"
-#endif
-
 #if ENABLE(SVG)
 #include "SVGElementInstance.h"
 #include "SVGUseElement.h"
index 2732d50..452e44b 100644 (file)
@@ -43,7 +43,6 @@ isEmpty(HAVE_QRAWFONT) {
 !contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=.): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1
 !contains(DEFINES, ENABLE_GAMEPAD=.): DEFINES += ENABLE_GAMEPAD=0
 !contains(DEFINES, ENABLE_SQL_DATABASE=.): DEFINES += ENABLE_SQL_DATABASE=1
-!contains(DEFINES, ENABLE_DOM_STORAGE=.): DEFINES += ENABLE_DOM_STORAGE=1
 !contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
 !contains(DEFINES, ENABLE_CHANNEL_MESSAGING=.): DEFINES += ENABLE_CHANNEL_MESSAGING=1
 !contains(DEFINES, ENABLE_DIRECTORY_UPLOAD=.): DEFINES += ENABLE_DIRECTORY_UPLOAD=0
@@ -186,7 +185,6 @@ contains(DEFINES, ENABLE_CHANNEL_MESSAGING=1): FEATURE_DEFINES_JAVASCRIPT += ENA
 contains(DEFINES, ENABLE_ORIENTATION_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_ORIENTATION_EVENTS=1
 contains(DEFINES, ENABLE_SQL_DATABASE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SQL_DATABASE=1
 contains(DEFINES, ENABLE_DATALIST=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATALIST=1
-contains(DEFINES, ENABLE_DOM_STORAGE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE=1
 contains(DEFINES, ENABLE_SHARED_SCRIPT=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SHARED_SCRIPT=1
 contains(DEFINES, ENABLE_WORKERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WORKERS=1
 contains(DEFINES, ENABLE_SHARED_WORKERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SHARED_WORKERS=1
index 6657834..8059866 100644 (file)
 #include "InspectorFrontend.h"
 #include "InspectorValues.h"
 #include "Pasteboard.h"
+#include "Storage.h"
 
 #if ENABLE(SQL_DATABASE)
 #include "Database.h"
 #endif
 
-#if ENABLE(DOM_STORAGE)
-#include "Storage.h"
-#endif
-
 #include "markup.h"
 
 #include <wtf/RefPtr.h>
@@ -75,9 +72,7 @@ InjectedScriptHost::InjectedScriptHost()
 #if ENABLE(SQL_DATABASE)
     , m_databaseAgent(0)
 #endif
-#if ENABLE(DOM_STORAGE)
     , m_domStorageAgent(0)
-#endif
     , m_frontend(0)
     , m_lastWorkerId(1 << 31) // Distinguish ids of fake workers from real ones, to minimize the chances they overlap.
 {
@@ -94,9 +89,7 @@ void InjectedScriptHost::disconnect()
 #if ENABLE(SQL_DATABASE)
     m_databaseAgent = 0;
 #endif
-#if ENABLE(DOM_STORAGE)
     m_domStorageAgent = 0;
-#endif
     m_frontend = 0;
 }
 
@@ -147,14 +140,12 @@ int InjectedScriptHost::databaseIdImpl(Database* database)
 }
 #endif
 
-#if ENABLE(DOM_STORAGE)
 int InjectedScriptHost::storageIdImpl(Storage* storage)
 {
     if (m_domStorageAgent)
         return m_domStorageAgent->storageId(storage);
     return 0;
 }
-#endif
 
 #if ENABLE(WORKERS)
 long InjectedScriptHost::nextWorkerId()
index c491777..57b56b0 100644 (file)
@@ -62,9 +62,7 @@ public:
 #if ENABLE(SQL_DATABASE)
             , InspectorDatabaseAgent* databaseAgent
 #endif
-#if ENABLE(DOM_STORAGE)
             , InspectorDOMStorageAgent* domStorageAgent
-#endif
         )
     {
         m_inspectorAgent = inspectorAgent;
@@ -72,9 +70,7 @@ public:
 #if ENABLE(SQL_DATABASE)
         m_databaseAgent = databaseAgent;
 #endif
-#if ENABLE(DOM_STORAGE)
         m_domStorageAgent = domStorageAgent;
-#endif
     }
     void setFrontend(InspectorFrontend* frontend) { m_frontend = frontend; }
     void clearFrontend() { m_frontend = 0; }
@@ -94,9 +90,7 @@ public:
 #if ENABLE(SQL_DATABASE)
     int databaseIdImpl(Database*);
 #endif
-#if ENABLE(DOM_STORAGE)
     int storageIdImpl(Storage*);
-#endif
 #if ENABLE(WORKERS)
     long nextWorkerId();
     void didCreateWorker(long id, const String& url, bool isSharedWorker);
@@ -111,9 +105,7 @@ private:
 #if ENABLE(SQL_DATABASE)
     InspectorDatabaseAgent* m_databaseAgent;
 #endif
-#if ENABLE(DOM_STORAGE)
     InspectorDOMStorageAgent* m_domStorageAgent;
-#endif
     InspectorFrontend* m_frontend;
     long m_lastWorkerId;
     Vector<RefPtr<Node> > m_inspectedNodes;
index 693ec42..d0edff7 100644 (file)
@@ -104,9 +104,7 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
 #if ENABLE(SQL_DATABASE)
     , m_databaseAgent(InspectorDatabaseAgent::create(m_instrumentingAgents.get(), m_state.get()))
 #endif
-#if ENABLE(DOM_STORAGE)
     , m_domStorageAgent(InspectorDOMStorageAgent::create(m_instrumentingAgents.get(), m_state.get()))
-#endif
     , m_timelineAgent(InspectorTimelineAgent::create(m_instrumentingAgents.get(), m_state.get()))
     , m_applicationCacheAgent(adoptPtr(new InspectorApplicationCacheAgent(m_instrumentingAgents.get(), page)))
     , m_resourceAgent(InspectorResourceAgent::create(m_instrumentingAgents.get(), m_pageAgent.get(), inspectorClient, m_state.get()))
@@ -131,9 +129,7 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
 #if ENABLE(SQL_DATABASE)
         , m_databaseAgent.get()
 #endif
-#if ENABLE(DOM_STORAGE)
         , m_domStorageAgent.get()
-#endif
     );
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
@@ -213,9 +209,7 @@ void InspectorController::connectFrontend()
 #if ENABLE(SQL_DATABASE)
     m_databaseAgent->setFrontend(m_inspectorFrontend.get());
 #endif
-#if ENABLE(DOM_STORAGE)
     m_domStorageAgent->setFrontend(m_inspectorFrontend.get());
-#endif
 #if ENABLE(WORKERS)
     m_workerAgent->setFrontend(m_inspectorFrontend.get());
 #endif
@@ -235,9 +229,7 @@ void InspectorController::connectFrontend()
 #if ENABLE(JAVASCRIPT_DEBUGGER)
         m_domDebuggerAgent.get(),
 #endif
-#if ENABLE(DOM_STORAGE)
         m_domStorageAgent.get(),
-#endif
 #if ENABLE(SQL_DATABASE)
         m_databaseAgent.get(),
 #endif
@@ -288,9 +280,7 @@ void InspectorController::disconnectFrontend()
 #if ENABLE(SQL_DATABASE)
     m_databaseAgent->clearFrontend();
 #endif
-#if ENABLE(DOM_STORAGE)
     m_domStorageAgent->clearFrontend();
-#endif
     m_pageAgent->clearFrontend();
 #if ENABLE(WORKERS)
     m_workerAgent->clearFrontend();
@@ -342,9 +332,7 @@ void InspectorController::restoreInspectorStateFromCookie(const String& inspecto
 #if ENABLE(SQL_DATABASE)
     m_databaseAgent->restore();
 #endif
-#if ENABLE(DOM_STORAGE)
     m_domStorageAgent->restore();
-#endif
 #if ENABLE(WORKERS)
     m_workerAgent->restore();
 #endif
index effa8cb..765cadf 100644 (file)
@@ -137,9 +137,7 @@ private:
 #if ENABLE(SQL_DATABASE)
     OwnPtr<InspectorDatabaseAgent> m_databaseAgent;
 #endif
-#if ENABLE(DOM_STORAGE)
     OwnPtr<InspectorDOMStorageAgent> m_domStorageAgent;
-#endif
     OwnPtr<InspectorTimelineAgent> m_timelineAgent;
     OwnPtr<InspectorApplicationCacheAgent> m_applicationCacheAgent;
     RefPtr<InspectorResourceAgent> m_resourceAgent;
index 1a4c8cd..6c82c5e 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "InspectorDOMStorageAgent.h"
 
-#if ENABLE(INSPECTOR) && ENABLE(DOM_STORAGE)
+#if ENABLE(INSPECTOR)
 
 #include "Database.h"
 #include "DOMWindow.h"
@@ -193,4 +193,4 @@ void InspectorDOMStorageAgent::clearResources()
 
 } // namespace WebCore
 
-#endif // ENABLE(INSPECTOR) && ENABLE(DOM_STORE)
+#endif // ENABLE(INSPECTOR)
index 992e34c..8d85f71 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(DOM_STORAGE) && ENABLE(INSPECTOR)
+#if ENABLE(INSPECTOR)
 
 #include "InspectorDOMStorageResource.h"
 
@@ -120,5 +120,5 @@ bool InspectorDOMStorageResource::operator==(const EventListener& listener)
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE) && ENABLE(INSPECTOR)
+#endif // ENABLE(INSPECTOR)
 
index eb75113..64153f3 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef InspectorDOMStorageResource_h
 #define InspectorDOMStorageResource_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "EventListener.h"
 #include "InspectorFrontend.h"
 
@@ -85,6 +83,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif
-
 #endif // InspectorDOMStorageResource_h
index 9e729ef..d778b9e 100644 (file)
@@ -657,10 +657,8 @@ void InspectorInstrumentation::didCommitLoadImpl(InstrumentingAgents* instrument
         if (InspectorDatabaseAgent* databaseAgent = instrumentingAgents->inspectorDatabaseAgent())
             databaseAgent->clearResources();
 #endif
-#if ENABLE(DOM_STORAGE)
         if (InspectorDOMStorageAgent* domStorageAgent = instrumentingAgents->inspectorDOMStorageAgent())
             domStorageAgent->clearResources();
-#endif
         if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
             domAgent->setDocument(mainFrame->document());
 
@@ -772,7 +770,6 @@ void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents* instrume
 }
 #endif
 
-#if ENABLE(DOM_STORAGE)
 void InspectorInstrumentation::didUseDOMStorageImpl(InstrumentingAgents* instrumentingAgents, StorageArea* storageArea, bool isLocalStorage, Frame* frame)
 {
     InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
@@ -781,7 +778,6 @@ void InspectorInstrumentation::didUseDOMStorageImpl(InstrumentingAgents* instrum
     if (InspectorDOMStorageAgent* domStorageAgent = instrumentingAgents->inspectorDOMStorageAgent())
         domStorageAgent->didUseDOMStorage(storageArea, isLocalStorage, frame);
 }
-#endif
 
 #if ENABLE(WORKERS)
 void InspectorInstrumentation::didStartWorkerContextImpl(InstrumentingAgents* instrumentingAgents, WorkerContextProxy* workerContextProxy, const KURL& url)
index b338589..fec2a6d 100644 (file)
@@ -172,9 +172,7 @@ public:
     static void didOpenDatabase(ScriptExecutionContext*, PassRefPtr<Database>, const String& domain, const String& name, const String& version);
 #endif
 
-#if ENABLE(DOM_STORAGE)
     static void didUseDOMStorage(Page*, StorageArea*, bool isLocalStorage, Frame*);
-#endif
 
 #if ENABLE(WORKERS)
     static void didStartWorkerContext(ScriptExecutionContext*, WorkerContextProxy*, const KURL&);
@@ -305,9 +303,7 @@ private:
     static void didOpenDatabaseImpl(InstrumentingAgents*, PassRefPtr<Database>, const String& domain, const String& name, const String& version);
 #endif
 
-#if ENABLE(DOM_STORAGE)
     static void didUseDOMStorageImpl(InstrumentingAgents*, StorageArea*, bool isLocalStorage, Frame*);
-#endif
 
 #if ENABLE(WORKERS)
     static void didStartWorkerContextImpl(InstrumentingAgents*, WorkerContextProxy*, const KURL&);
@@ -939,7 +935,6 @@ inline void InspectorInstrumentation::didWriteHTML(const InspectorInstrumentatio
 #endif
 }
 
-#if ENABLE(DOM_STORAGE)
 inline void InspectorInstrumentation::didUseDOMStorage(Page* page, StorageArea* storageArea, bool isLocalStorage, Frame* frame)
 {
 #if ENABLE(INSPECTOR)
@@ -947,7 +942,6 @@ inline void InspectorInstrumentation::didUseDOMStorage(Page* page, StorageArea*
         didUseDOMStorageImpl(instrumentingAgents, storageArea, isLocalStorage, frame);
 #endif
 }
-#endif
 
 #if ENABLE(WORKERS)
 inline void InspectorInstrumentation::didStartWorkerContext(ScriptExecutionContext* context, WorkerContextProxy* proxy, const KURL& url)
index 983c867..7cd7f7a 100644 (file)
@@ -67,9 +67,7 @@ public:
         , m_inspectorResourceAgent(0)
         , m_inspectorRuntimeAgent(0)
         , m_inspectorTimelineAgent(0)
-#if ENABLE(DOM_STORAGE)
         , m_inspectorDOMStorageAgent(0)
-#endif
 #if ENABLE(SQL_DATABASE)
         , m_inspectorDatabaseAgent(0)
 #endif
@@ -109,16 +107,17 @@ public:
     InspectorTimelineAgent* inspectorTimelineAgent() const { return m_inspectorTimelineAgent; }
     void setInspectorTimelineAgent(InspectorTimelineAgent* agent) { m_inspectorTimelineAgent = agent; }
 
-#if ENABLE(DOM_STORAGE)
     InspectorDOMStorageAgent* inspectorDOMStorageAgent() const { return m_inspectorDOMStorageAgent; }
     void setInspectorDOMStorageAgent(InspectorDOMStorageAgent* agent) { m_inspectorDOMStorageAgent = agent; }
-#endif
+
 #if ENABLE(SQL_DATABASE)
     InspectorDatabaseAgent* inspectorDatabaseAgent() const { return m_inspectorDatabaseAgent; }
     void setInspectorDatabaseAgent(InspectorDatabaseAgent* agent) { m_inspectorDatabaseAgent = agent; }
 #endif
+
     InspectorApplicationCacheAgent* inspectorApplicationCacheAgent() const { return m_inspectorApplicationCacheAgent; }
     void setInspectorApplicationCacheAgent(InspectorApplicationCacheAgent* agent) { m_inspectorApplicationCacheAgent = agent; }
+
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     InspectorDebuggerAgent* inspectorDebuggerAgent() const { return m_inspectorDebuggerAgent; }
     void setInspectorDebuggerAgent(InspectorDebuggerAgent* agent) { m_inspectorDebuggerAgent = agent; }
@@ -143,9 +142,7 @@ private:
     InspectorResourceAgent* m_inspectorResourceAgent;
     InspectorRuntimeAgent* m_inspectorRuntimeAgent;
     InspectorTimelineAgent* m_inspectorTimelineAgent;
-#if ENABLE(DOM_STORAGE)
     InspectorDOMStorageAgent* m_inspectorDOMStorageAgent;
-#endif
 #if ENABLE(SQL_DATABASE)
     InspectorDatabaseAgent* m_inspectorDatabaseAgent;
 #endif
index 046d6ab..765a308 100644 (file)
@@ -120,9 +120,7 @@ WorkerInspectorController::WorkerInspectorController(WorkerContext* workerContex
 #if ENABLE(SQL_DATABASE)
         , 0
 #endif
-#if ENABLE(DOM_STORAGE)
         , 0
-#endif
     );
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
@@ -150,9 +148,7 @@ void WorkerInspectorController::connectFrontend()
         0, // InspectorCSSAgent
         0, // InspectorConsoleAgent
         0, // InspectorDOMAgent
-#if ENABLE(DOM_STORAGE)
         0, // InspectorDOMStorageAgent
-#endif
 #if ENABLE(SQL_DATABASE)
         0, // InspectorDatabaseAgent
 #endif
index 18ded61..17ae661 100755 (executable)
@@ -85,7 +85,6 @@ ref_types = {}
 
 macro_traits = {
     "Database": "SQL_DATABASE",
-    "DOMStorage": "DOM_STORAGE",
     "Debugger": "JAVASCRIPT_DEBUGGER",
     "DOMDebugger": "JAVASCRIPT_DEBUGGER",
     "Profiler": "JAVASCRIPT_DEBUGGER",
index 2742ba2..9c430fe 100644 (file)
 #include "ResourceHandle.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
+#include "StorageNamespace.h"
 #include "WindowFeatures.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 #include <wtf/text/StringBuilder.h>
 
-#if ENABLE(DOM_STORAGE)
-#include "StorageNamespace.h"
-#endif
-
 #if ENABLE(INPUT_COLOR)
 #include "ColorChooser.h"
 #endif
@@ -185,12 +182,10 @@ Page* Chrome::createWindow(Frame* frame, const FrameLoadRequest& request, const
 {
     Page* newPage = m_client->createWindow(frame, request, features, action);
 
-#if ENABLE(DOM_STORAGE)
     if (newPage) {
         if (StorageNamespace* oldSessionStorage = m_page->sessionStorage(false))
             newPage->setSessionStorage(oldSessionStorage->copy());
     }
-#endif
 
     return newPage;
 }
index 685e630..6b05640 100644 (file)
@@ -422,10 +422,8 @@ DOMWindow::~DOMWindow()
 #endif
     ASSERT(!m_location);
     ASSERT(!m_media);
-#if ENABLE(DOM_STORAGE)
     ASSERT(!m_sessionStorage);
     ASSERT(!m_localStorage);
-#endif
     ASSERT(!m_applicationCache);
 #if ENABLE(NOTIFICATIONS)
     ASSERT(!m_notifications);
@@ -530,8 +528,7 @@ void DOMWindow::clear()
     if (m_media)
         m_media->disconnectFrame();
     m_media = 0;
-    
-#if ENABLE(DOM_STORAGE)
+
     if (m_sessionStorage)
         m_sessionStorage->disconnectFrame();
     m_sessionStorage = 0;
@@ -539,7 +536,6 @@ void DOMWindow::clear()
     if (m_localStorage)
         m_localStorage->disconnectFrame();
     m_localStorage = 0;
-#endif
 
     if (m_applicationCache)
         m_applicationCache->disconnectFrame();
@@ -679,7 +675,6 @@ Location* DOMWindow::location() const
     return m_location.get();
 }
 
-#if ENABLE(DOM_STORAGE)
 Storage* DOMWindow::sessionStorage(ExceptionCode& ec) const
 {
     if (m_sessionStorage || !isCurrentlyDisplayedInFrame())
@@ -732,7 +727,6 @@ Storage* DOMWindow::localStorage(ExceptionCode& ec) const
     m_localStorage = Storage::create(m_frame, storageArea.release());
     return m_localStorage.get();
 }
-#endif
 
 #if ENABLE(NOTIFICATIONS)
 NotificationCenter* DOMWindow::webkitNotifications() const
index 3e97054..0cb0a2e 100644 (file)
@@ -358,11 +358,9 @@ namespace WebCore {
         DEFINE_ATTRIBUTE_EVENT_LISTENER(deviceorientation);
 #endif
 
-#if ENABLE(DOM_STORAGE)
         // HTML 5 key/value storage
         Storage* sessionStorage(ExceptionCode&) const;
         Storage* localStorage(ExceptionCode&) const;
-#endif
 
 #if ENABLE(FILE_SYSTEM)
         // They are placed here and in all capital letters so they can be checked against the constants in the
@@ -455,10 +453,8 @@ namespace WebCore {
         String m_status;
         String m_defaultStatus;
 
-#if ENABLE(DOM_STORAGE)
         mutable RefPtr<Storage> m_sessionStorage;
         mutable RefPtr<Storage> m_localStorage;
-#endif
 
 #if ENABLE(INDEXED_DATABASE)
         mutable RefPtr<IDBFactory> m_idbFactory;
index 8b509a8..5b6c093 100644 (file)
@@ -169,12 +169,12 @@ module window {
         [EnabledAtRuntime] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
             raises(DOMException);
 #endif
-#if defined(ENABLE_DOM_STORAGE) && ENABLE_DOM_STORAGE
+
         readonly attribute [EnabledAtRuntime] Storage sessionStorage
             getter raises(DOMException);
         readonly attribute [EnabledAtRuntime] Storage localStorage
             getter raises(DOMException);
-#endif
+
 #if defined(ENABLE_NOTIFICATIONS) && ENABLE_NOTIFICATIONS
         readonly attribute [EnabledAtRuntime] NotificationCenter webkitNotifications;
 #endif
@@ -547,7 +547,7 @@ module window {
         attribute [Conditional=DEVICE_ORIENTATION, EnabledAtRuntime] DeviceOrientationEventConstructor DeviceOrientationEvent;
         attribute [Conditional=TOUCH_EVENTS] TouchEventConstructor TouchEvent;
         attribute [Conditional=WEB_SOCKETS] CloseEventConstructor CloseEvent;
-        attribute [Conditional=DOM_STORAGE] StorageEventConstructor StorageEvent;
+        attribute StorageEventConstructor StorageEvent;
         attribute [Conditional=WEB_AUDIO] AudioProcessingEventConstructor AudioProcessingEvent;
         attribute [Conditional=WEB_AUDIO] OfflineAudioCompletionEventConstructor OfflineAudioCompletionEvent;
         attribute [Conditional=INPUT_SPEECH] SpeechInputEventConstructor SpeechInputEvent;
@@ -614,9 +614,7 @@ module window {
         attribute ClientRectConstructor ClientRect;
         attribute ClientRectListConstructor ClientRectList;
 
-#if defined(ENABLE_DOM_STORAGE) && ENABLE_DOM_STORAGE
         attribute StorageConstructor Storage;
-#endif
 
         attribute [CustomGetter, Conditional=VIDEO, EnabledAtRuntime] HTMLAudioElementConstructor Audio; // Usable with the new operator
         attribute [Conditional=VIDEO, EnabledAtRuntime] HTMLAudioElementConstructor HTMLAudioElement;
index b1e4ab1..1939a3e 100644 (file)
@@ -167,7 +167,6 @@ Geolocation* Navigator::geolocation() const
     return m_geolocation.get();
 }
 
-#if ENABLE(DOM_STORAGE)
 void Navigator::getStorageUpdates()
 {
     if (!m_frame)
@@ -181,7 +180,6 @@ void Navigator::getStorageUpdates()
     if (localStorage)
         localStorage->unlock();
 }
-#endif
 
 #if ENABLE(REGISTER_PROTOCOL_HANDLER)
 static HashSet<String>* protocolWhitelist;
index 8d1c69e..3a1e042 100644 (file)
@@ -58,10 +58,8 @@ public:
 
     Geolocation* geolocation() const;
 
-#if ENABLE(DOM_STORAGE)
     // Relinquishes the storage lock, if one exists.
     void getStorageUpdates();
-#endif
 
 #if ENABLE(REGISTER_PROTOCOL_HANDLER)
     void registerProtocolHandler(const String& scheme, const String& url, const String& title, ExceptionCode&);
index c90d857..2f691c3 100644 (file)
@@ -44,9 +44,7 @@ module window {
         readonly attribute [EnabledAtRuntime] Geolocation geolocation;
 #endif
 
-#if defined(ENABLE_DOM_STORAGE) && ENABLE_DOM_STORAGE
         void getStorageUpdates();
-#endif
 
 #if defined(ENABLE_REGISTER_PROTOCOL_HANDLER) && ENABLE_REGISTER_PROTOCOL_HANDLER
         void registerProtocolHandler(in DOMString scheme, in DOMString url, in DOMString title)
index bfbe70a..b67494c 100644 (file)
@@ -68,6 +68,8 @@
 #include "SharedBuffer.h"
 #include "SpeechInput.h"
 #include "SpeechInputClient.h"
+#include "StorageArea.h"
+#include "StorageNamespace.h"
 #include "TextResourceDecoder.h"
 #include "Widget.h"
 #include <wtf/HashMap.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/StringHash.h>
 
-#if ENABLE(DOM_STORAGE)
-#include "StorageArea.h"
-#include "StorageNamespace.h"
-#endif
-
 #if ENABLE(CLIENT_BASED_GEOLOCATION)
 #include "GeolocationController.h"
 #endif
@@ -835,7 +832,6 @@ void Page::setDebugger(JSC::Debugger* debugger)
         frame->script()->attachDebugger(m_debugger);
 }
 
-#if ENABLE(DOM_STORAGE)
 StorageNamespace* Page::sessionStorage(bool optionalCreate)
 {
     if (!m_sessionStorage && optionalCreate)
@@ -848,7 +844,6 @@ void Page::setSessionStorage(PassRefPtr<StorageNamespace> newStorage)
 {
     m_sessionStorage = newStorage;
 }
-#endif
 
 void Page::setCustomHTMLTokenizerTimeDelay(double customHTMLTokenizerTimeDelay)
 {
index e70fdbd..30feeda 100644 (file)
@@ -84,9 +84,7 @@ namespace WebCore {
     class Settings;
     class SpeechInput;
     class SpeechInputClient;
-#if ENABLE(DOM_STORAGE)
     class StorageNamespace;
-#endif
 #if ENABLE(NOTIFICATIONS)
     class NotificationPresenter;
 #endif
@@ -274,10 +272,8 @@ namespace WebCore {
         static void allVisitedStateChanged(PageGroup*);
         static void visitedStateChanged(PageGroup*, LinkHash visitedHash);
 
-#if ENABLE(DOM_STORAGE)
         StorageNamespace* sessionStorage(bool optionalCreate = true);
         void setSessionStorage(PassRefPtr<StorageNamespace>);
-#endif
 
         void setCustomHTMLTokenizerTimeDelay(double);
         bool hasCustomHTMLTokenizerTimeDelay() const { return m_customHTMLTokenizerTimeDelay != -1; }
@@ -400,9 +396,7 @@ namespace WebCore {
 
         bool m_canStartMedia;
 
-#if ENABLE(DOM_STORAGE)
         RefPtr<StorageNamespace> m_sessionStorage;
-#endif
 
 #if ENABLE(NOTIFICATIONS)
         NotificationPresenter* m_notificationPresenter;
index b00a37c..2c01fb1 100644 (file)
@@ -99,7 +99,6 @@ PageGroup* PageGroup::pageGroup(const String& groupName)
 
 void PageGroup::closeLocalStorage()
 {
-#if ENABLE(DOM_STORAGE)
     if (!pageGroups)
         return;
 
@@ -109,11 +108,8 @@ void PageGroup::closeLocalStorage()
         if (it->second->hasLocalStorage())
             it->second->localStorage()->close();
     }
-#endif
 }
 
-#if ENABLE(DOM_STORAGE)
-
 void PageGroup::clearLocalStorageForAllOrigins()
 {
     if (!pageGroups)
@@ -158,8 +154,6 @@ unsigned PageGroup::numberOfPageGroups()
     return pageGroups->size();
 }
 
-#endif
-
 void PageGroup::addPage(Page* page)
 {
     ASSERT(page);
@@ -246,7 +240,6 @@ void PageGroup::setShouldTrackVisitedLinks(bool shouldTrack)
         removeAllVisitedLinks();
 }
 
-#if ENABLE(DOM_STORAGE)
 StorageNamespace* PageGroup::localStorage()
 {
     if (!m_localStorage) {
@@ -263,8 +256,6 @@ StorageNamespace* PageGroup::localStorage()
     return m_localStorage.get();
 }
 
-#endif
-
 #if ENABLE(INDEXED_DATABASE)
 IDBFactoryBackendInterface* PageGroup::idbFactory()
 {
index 0f8e370..8b62368 100644 (file)
@@ -53,14 +53,13 @@ namespace WebCore {
 
         static void closeLocalStorage();
 
-#if ENABLE(DOM_STORAGE)
         static void clearLocalStorageForAllOrigins();
         static void clearLocalStorageForOrigin(SecurityOrigin*);
         // DumpRenderTree helper that triggers a StorageArea sync.
         static void syncLocalStorage();
-#endif
+
         static unsigned numberOfPageGroups();
-        
+
         const HashSet<Page*>& pages() const { return m_pages; }
 
         void addPage(Page*);
@@ -79,10 +78,9 @@ namespace WebCore {
         const String& name() { return m_name; }
         unsigned identifier() { return m_identifier; }
 
-#if ENABLE(DOM_STORAGE)
         StorageNamespace* localStorage();
         bool hasLocalStorage() { return m_localStorage; }
-#endif
+
 #if ENABLE(INDEXED_DATABASE)
         IDBFactoryBackendInterface* idbFactory();
         bool hasIDBFactory() { return m_factoryBackend; }
@@ -121,9 +119,7 @@ namespace WebCore {
         bool m_visitedLinksPopulated;
 
         unsigned m_identifier;
-#if ENABLE(DOM_STORAGE)
         RefPtr<StorageNamespace> m_localStorage;
-#endif
 #if ENABLE(INDEXED_DATABASE)
         RefPtr<IDBFactoryBackendInterface> m_factoryBackend;
 #endif
index 67dc1da..e193d27 100644 (file)
@@ -122,9 +122,7 @@ Settings::Settings(Page* page)
     , m_maximumDecodedImageSize(numeric_limits<size_t>::max())
     , m_deviceWidth(480)
     , m_deviceHeight(854)
-#if ENABLE(DOM_STORAGE)
     , m_sessionStorageQuota(StorageMap::noQuota)
-#endif
     , m_editingBehaviorType(editingBehaviorTypeForPlatform())
     , m_maximumHTMLParserDOMTreeDepth(defaultMaximumHTMLParserDOMTreeDepth)
     , m_isSpatialNavigationEnabled(false)
@@ -408,12 +406,10 @@ void Settings::setLocalStorageEnabled(bool localStorageEnabled)
     m_localStorageEnabled = localStorageEnabled;
 }
 
-#if ENABLE(DOM_STORAGE)
 void Settings::setSessionStorageQuota(unsigned sessionStorageQuota)
 {
     m_sessionStorageQuota = sessionStorageQuota;
 }
-#endif
 
 void Settings::setPrivateBrowsingEnabled(bool privateBrowsingEnabled)
 {
index e357da9..57ee26d 100644 (file)
@@ -152,13 +152,11 @@ namespace WebCore {
         void setLocalStorageEnabled(bool);
         bool localStorageEnabled() const { return m_localStorageEnabled; }
 
-#if ENABLE(DOM_STORAGE)
         // Allow clients concerned with memory consumption to set a quota on session storage
         // since the memory used won't be released until the Page is destroyed.
         // Default is noQuota.
         void setSessionStorageQuota(unsigned);
         unsigned sessionStorageQuota() const { return m_sessionStorageQuota; }
-#endif
 
         // When this option is set, WebCore will avoid storing any record of browsing activity
         // that may persist on disk or remain displayed when the option is reset.
@@ -498,9 +496,7 @@ namespace WebCore {
         size_t m_maximumDecodedImageSize;
         int m_deviceWidth;
         int m_deviceHeight;
-#if ENABLE(DOM_STORAGE)
         unsigned m_sessionStorageQuota;
-#endif
         unsigned m_editingBehaviorType;
         unsigned m_maximumHTMLParserDOMTreeDepth;
         bool m_isSpatialNavigationEnabled : 1;
index 5d2c807..39b16b4 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "LocalStorageTask.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "LocalStorageThread.h"
 #include "StorageAreaSync.h"
 #include "StorageTracker.h"
@@ -108,5 +106,3 @@ void LocalStorageTask::performTask()
 }
 
 }
-
-#endif // ENABLE(DOM_STORAGE)
index 99e72f5..3e8b6b1 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef LocalStorageTask_h
 #define LocalStorageTask_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "PlatformString.h"
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Threading.h>
@@ -72,6 +70,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // LocalStorageTask_h
index 6242b5f..ba1b0fa 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "LocalStorageThread.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "LocalStorageTask.h"
 #include "StorageAreaSync.h"
 #include <wtf/MainThread.h>
@@ -101,5 +99,3 @@ void LocalStorageThread::performTerminate()
 }
 
 }
-
-#endif // ENABLE(DOM_STORAGE)
index a2c78c6..46467af 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef LocalStorageThread_h
 #define LocalStorageThread_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include <wtf/HashSet.h>
 #include <wtf/MessageQueue.h>
 #include <wtf/PassOwnPtr.h>
@@ -66,6 +64,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // LocalStorageThread_h
index 9e975ab..672ea97 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "Storage.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "Frame.h"
 #include "Page.h"
 #include "Settings.h"
@@ -112,5 +110,3 @@ bool Storage::contains(const String& key) const
 }
 
 }
-
-#endif // ENABLE(DOM_STORAGE)
index c81481a..219bc55 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef Storage_h
 #define Storage_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
@@ -64,6 +62,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // Storage_h
index 32a1303..fc6d16e 100644 (file)
@@ -32,7 +32,6 @@ module storage {
         CustomDeleteProperty,
         CustomGetPropertyNames,
         DelegatingPutFunction,
-        Conditional=DOM_STORAGE
     ] Storage {
         readonly attribute [DontEnum] unsigned long length;
         [DontEnum, ConvertNullStringTo=Null] DOMString key(in unsigned long index);
index 1dc0138..59ff644 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef StorageArea_h
 #define StorageArea_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "PlatformString.h"
 
 #include <wtf/PassRefPtr.h>
@@ -59,6 +57,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // StorageArea_h
index 9a3ceff..115186c 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "StorageAreaImpl.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "ExceptionCode.h"
 #include "Frame.h"
 #include "Page.h"
@@ -266,5 +264,3 @@ void StorageAreaImpl::blockUntilImportComplete() const
 }
 
 }
-
-#endif // ENABLE(DOM_STORAGE)
index 1aa5a05..fda6d55 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef StorageAreaImpl_h
 #define StorageAreaImpl_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "StorageArea.h"
 
 #include <wtf/PassRefPtr.h>
@@ -84,6 +82,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // StorageAreaImpl_h
index 1389bc4..5d31e6c 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "StorageAreaSync.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "EventNames.h"
 #include "FileSystem.h"
 #include "HTMLElement.h"
@@ -521,7 +519,5 @@ void StorageAreaSync::scheduleSync()
 {
     syncTimerFired(&m_syncTimer);
 }
-    
-} // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
+} // namespace WebCore
index 3a34eda..e5124c4 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef StorageAreaSync_h
 #define StorageAreaSync_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "SQLiteDatabase.h"
 #include "Timer.h"
 #include <wtf/HashMap.h>
@@ -107,6 +105,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // StorageAreaSync_h
index a08cde2..cb7a364 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "StorageEvent.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "Storage.h"
 
 namespace WebCore {
@@ -75,5 +73,3 @@ void StorageEvent::initStorageEvent(const AtomicString& type, bool canBubble, bo
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(DOM_STORAGE)
index 8e558a8..5dd6a24 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef StorageEvent_h
 #define StorageEvent_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "Event.h"
 #include "PlatformString.h"
 
@@ -67,6 +65,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // StorageEvent_h
index eca14ac..2e2e358 100644 (file)
@@ -25,9 +25,7 @@
 
 module storage {
 
-    interface [
-        Conditional=DOM_STORAGE
-    ] StorageEvent : Event {
+    interface StorageEvent : Event {
         readonly attribute [ConvertNullStringTo=Null] DOMString key;
         readonly attribute [ConvertNullStringTo=Null] DOMString oldValue;
         readonly attribute [ConvertNullStringTo=Null] DOMString newValue;
index 8220320..ebbd498 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "StorageEventDispatcher.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "Document.h"
 #include "DOMWindow.h"
 #include "EventNames.h"
@@ -82,5 +80,3 @@ void StorageEventDispatcher::dispatch(const String& key, const String& oldValue,
 }
 
 }
-
-#endif // ENABLE(DOM_STORAGE)
index f4a98ef..6739be9 100644 (file)
@@ -30,8 +30,6 @@
 #ifndef StorageEventDispatcher_h
 #define StorageEventDispatcher_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "PlatformString.h"
 #include "StorageArea.h"
 
@@ -49,6 +47,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // StorageEventDispatcher_h
index 916a6d5..fdcae12 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "StorageMap.h"
 
-#if ENABLE(DOM_STORAGE)
-
 namespace WebCore {
 
 PassRefPtr<StorageMap> StorageMap::create(unsigned quota)
@@ -183,5 +181,3 @@ void StorageMap::importItem(const String& key, const String& value)
 }
 
 }
-
-#endif // ENABLE(DOM_STORAGE)
index cc09d0f..1fc17b0 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef StorageMap_h
 #define StorageMap_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "PlatformString.h"
 #include <wtf/HashMap.h>
 #include <wtf/PassRefPtr.h>
@@ -71,6 +69,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // StorageMap_h
index ce36608..1b589e5 100644 (file)
@@ -32,8 +32,6 @@
 #error "Chromium should not compile this file and instead define its own version of these factories that navigate the multi-process boundry."
 #endif
 
-#if ENABLE(DOM_STORAGE)
-
 namespace WebCore {
 
 PassRefPtr<StorageNamespace> StorageNamespace::localStorageNamespace(const String& path, unsigned quota)
@@ -48,5 +46,3 @@ PassRefPtr<StorageNamespace> StorageNamespace::sessionStorageNamespace(Page*, un
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(DOM_STORAGE)
index cb5df85..b8fa779 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef StorageNamespace_h
 #define StorageNamespace_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "PlatformString.h"
 
 #include <wtf/PassRefPtr.h>
@@ -57,6 +55,4 @@ public:
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // StorageNamespace_h
index 9665485..90096d9 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "StorageNamespaceImpl.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "SecurityOriginHash.h"
 #include "StorageAreaImpl.h"
 #include "StorageMap.h"
@@ -173,5 +171,3 @@ void StorageNamespaceImpl::sync()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(DOM_STORAGE)
index b562696..1153093 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef StorageNamespaceImpl_h
 #define StorageNamespaceImpl_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "PlatformString.h"
 #include "SecurityOriginHash.h"
 #include "StorageArea.h"
@@ -77,6 +75,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // StorageNamespaceImpl_h
index 00ca7d2..2778043 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "StorageSyncManager.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "EventNames.h"
 #include "FileSystem.h"
 #include "Frame.h"
@@ -108,6 +106,5 @@ void StorageSyncManager::scheduleDeleteEmptyDatabase(PassRefPtr<StorageAreaSync>
     if (m_thread)
         m_thread->scheduleTask(LocalStorageTask::createDeleteEmptyDatabase(area.get()));
 }
-} // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
+} // namespace WebCore
index 6fbb75d..5e0f165 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef StorageSyncManager_h
 #define StorageSyncManager_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "PlatformString.h"
 
 #include <wtf/PassRefPtr.h>
@@ -67,6 +65,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // StorageSyncManager_h
index c0cbe6b..9093f46 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "StorageTracker.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "DatabaseThread.h"
 #include "FileSystem.h"
 #include "LocalStorageTask.h"
@@ -590,5 +588,3 @@ long long StorageTracker::diskUsageForOrigin(SecurityOrigin* origin)
 }
     
 } // namespace WebCore
-
-#endif // ENABLE(DOM_STORAGE)
index e2950ce..e73cbf8 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef StorageTracker_h
 #define StorageTracker_h
 
-#if ENABLE(DOM_STORAGE)
-    
 #include "PlatformString.h"
 #include "SQLiteDatabase.h"
 #include <wtf/HashSet.h>
@@ -117,6 +115,4 @@ private:
     
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // StorageTracker_h
index e79400e..0339cbd 100644 (file)
@@ -1,3 +1,30 @@
+2011-10-16  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(DOM_STORAGE)
+        https://bugs.webkit.org/show_bug.cgi?id=70189
+
+        Reviewed by Eric Seidel.
+
+        * features.gypi:
+        * src/StorageAreaProxy.cpp:
+        * src/StorageAreaProxy.h:
+        * src/StorageEventDispatcherChromium.cpp:
+        * src/StorageEventDispatcherImpl.cpp:
+        * src/StorageEventDispatcherImpl.h:
+        * src/StorageNamespaceProxy.cpp:
+        * src/StorageNamespaceProxy.h:
+        * src/WebRuntimeFeatures.cpp:
+        (WebKit::WebRuntimeFeatures::enableLocalStorage):
+        (WebKit::WebRuntimeFeatures::isLocalStorageEnabled):
+        (WebKit::WebRuntimeFeatures::enableSessionStorage):
+        (WebKit::WebRuntimeFeatures::isSessionStorageEnabled):
+        * src/WebStorageAreaImpl.cpp:
+        * src/WebStorageAreaImpl.h:
+        * src/WebStorageEventDispatcherImpl.cpp:
+        * src/WebStorageEventDispatcherImpl.h:
+        * src/WebStorageNamespaceImpl.cpp:
+        * src/WebStorageNamespaceImpl.h:
+
 2011-10-15  Adam Barth  <abarth@webkit.org>
 
         Rename ENABLE(SKIA_TEXT) to USE(SKIA_TEXT)
index 405440f..c1c36c6 100644 (file)
@@ -42,7 +42,6 @@
       'ENABLE_DETAILS=1',
       'ENABLE_DEVICE_ORIENTATION=1',
       'ENABLE_DIRECTORY_UPLOAD=1',
-      'ENABLE_DOM_STORAGE=1',
       'ENABLE_DOWNLOAD_ATTRIBUTE=1',
       'ENABLE_FILE_SYSTEM=1',
       'ENABLE_FILTERS=1',
index 431754a..f365dc4 100644 (file)
@@ -27,8 +27,6 @@
 #include "config.h"
 #include "StorageAreaProxy.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "DOMWindow.h"
 #include "Document.h"
 #include "EventNames.h"
@@ -175,5 +173,3 @@ bool StorageAreaProxy::canAccessStorage(Frame* frame) const
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(DOM_STORAGE)
index fd91bad..4be7c9b 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef StorageAreaProxy_h
 #define StorageAreaProxy_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "StorageArea.h"
 
 namespace WebKit { class WebStorageArea; }
@@ -61,6 +59,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // StorageAreaProxy_h
index fec9fbf..2f604f5 100644 (file)
@@ -31,8 +31,6 @@
 #include "config.h"
 #include "StorageEventDispatcher.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "SecurityOrigin.h"
 #include "StorageArea.h"
 
@@ -52,5 +50,3 @@ void StorageEventDispatcher::dispatch(const String& key, const String& oldValue,
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(DOM_STORAGE)
index dd0b3fe..7ee3eb2 100644 (file)
@@ -31,8 +31,6 @@
 #include "config.h"
 #include "StorageEventDispatcherImpl.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "DOMWindow.h"
 #include "Document.h"
 #include "EventNames.h"
@@ -81,5 +79,3 @@ void StorageEventDispatcherImpl::dispatchStorageEvent(const String& key, const S
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(DOM_STORAGE)
index 4c2db7c..d343385 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef StorageEventDispatcherImpl_h
 #define StorageEventDispatcherImpl_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "PlatformString.h"
 #include "StorageArea.h"
 
@@ -56,6 +54,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // StorageEventDispatcherImpl_h
index 4d6ab55..f36e2f1 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "StorageNamespaceProxy.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "Chrome.h"
 #include "ChromeClientImpl.h"
 #include "Page.h"
@@ -108,5 +106,3 @@ void StorageNamespaceProxy::sync()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(DOM_STORAGE)
index 9388531..f7f716e 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef StorageNamespaceProxy_h
 #define StorageNamespaceProxy_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "StorageArea.h"
 #include "StorageNamespace.h"
 
@@ -56,6 +54,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // StorageNamespaceProxy_h
index 6d4fe4e..0de6074 100644 (file)
@@ -58,36 +58,28 @@ bool WebRuntimeFeatures::isDatabaseEnabled()
 #endif
 }
 
+// FIXME: Remove the ability to enable this feature at runtime.
 void WebRuntimeFeatures::enableLocalStorage(bool enable)
 {
-#if ENABLE(DOM_STORAGE)
     RuntimeEnabledFeatures::setLocalStorageEnabled(enable);
-#endif
 }
 
+// FIXME: Remove the ability to enable this feature at runtime.
 bool WebRuntimeFeatures::isLocalStorageEnabled()
 {
-#if ENABLE(DOM_STORAGE)
     return RuntimeEnabledFeatures::localStorageEnabled();
-#else
-    return false;
-#endif
 }
 
+// FIXME: Remove the ability to enable this feature at runtime.
 void WebRuntimeFeatures::enableSessionStorage(bool enable)
 {
-#if ENABLE(DOM_STORAGE)
     RuntimeEnabledFeatures::setSessionStorageEnabled(enable);
-#endif
 }
 
+// FIXME: Remove the ability to enable this feature at runtime.
 bool WebRuntimeFeatures::isSessionStorageEnabled()
 {
-#if ENABLE(DOM_STORAGE)
     return RuntimeEnabledFeatures::sessionStorageEnabled();
-#else
-    return false;
-#endif
 }
 
 void WebRuntimeFeatures::enableMediaPlayer(bool enable)
index da8208f..25b21bc 100644 (file)
@@ -31,8 +31,6 @@
 #include "config.h"
 #include "WebStorageAreaImpl.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "ExceptionCode.h"
 
 #include "WebString.h"
@@ -93,5 +91,3 @@ void WebStorageAreaImpl::clear(const WebURL& url, bool& somethingCleared)
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(DOM_STORAGE)
index 71f98b2..b973188 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef WebStorageAreaImpl_h
 #define WebStorageAreaImpl_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "StorageAreaImpl.h"
 #include "WebStorageArea.h"
 
@@ -78,6 +76,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // WebStorageAreaImpl_h
index 25a8603..23a4908 100644 (file)
@@ -31,8 +31,6 @@
 #include "config.h"
 #include "WebStorageEventDispatcherImpl.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "KURL.h"
 #include "SecurityOrigin.h"
 
@@ -69,5 +67,3 @@ void WebStorageEventDispatcherImpl::dispatchStorageEvent(const WebString& key, c
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(DOM_STORAGE)
index 6848b99..7489636 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef WebStorageEventDispatcherImpl_h
 #define WebStorageEventDispatcherImpl_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "StorageEventDispatcherImpl.h"
 #include "WebStorageEventDispatcher.h"
 #include <wtf/OwnPtr.h>
@@ -53,6 +51,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // WebStorageEventDispatcherImpl_h
index 7791941..7470a7b 100644 (file)
 #include "config.h"
 #include "WebStorageNamespaceImpl.h"
 
-#if ENABLE(DOM_STORAGE)
-
 #include "SecurityOrigin.h"
-
 #include "WebStorageAreaImpl.h"
 #include "WebString.h"
 
@@ -76,5 +73,3 @@ void WebStorageNamespaceImpl::close()
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(DOM_STORAGE)
index 4e82c21..10406c1 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef WebStorageNamespaceImpl_h
 #define WebStorageNamespaceImpl_h
 
-#if ENABLE(DOM_STORAGE)
-
 #include "StorageNamespaceImpl.h"
 #include "WebStorageNamespace.h"
 
@@ -52,6 +50,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(DOM_STORAGE)
-
 #endif // WebStorageNamespaceImpl_h
index ea2fa93..504b012 100644 (file)
@@ -1,3 +1,19 @@
+2011-10-16  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(DOM_STORAGE)
+        https://bugs.webkit.org/show_bug.cgi?id=70189
+
+        Reviewed by Eric Seidel.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * Storage/WebStorageManager.mm:
+        * Storage/WebStorageManagerInternal.h:
+        * Storage/WebStorageTrackerClient.h:
+        * Storage/WebStorageTrackerClient.mm:
+        (WebStorageTrackerClient::dispatchDidModifyOrigin):
+        * WebView/WebView.mm:
+        (-[WebView _commonInitializationWithFrameName:groupName:]):
+
 2011-10-14  David Kilzer  <ddkilzer@apple.com>
 
         <http://webkit.org/b/70158> Fix clang compiler warnings
index fcf6052..4137deb 100644 (file)
@@ -79,7 +79,6 @@ ENABLE_DATA_TRANSFER_ITEMS = ;
 ENABLE_DETAILS = ENABLE_DETAILS;
 ENABLE_DEVICE_ORIENTATION = ;
 ENABLE_DIRECTORY_UPLOAD = ;
-ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
 ENABLE_FILE_SYSTEM = ;
 ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
 ENABLE_GAMEPAD = ;
@@ -115,4 +114,4 @@ ENABLE_WORKERS = ENABLE_WORKERS;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 56a3d99..bb24b3e 100644 (file)
@@ -23,8 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if ENABLE(DOM_STORAGE)
-
 #import "WebSecurityOriginInternal.h"
 #import "WebStorageManagerPrivate.h"
 #import "WebStorageManagerInternal.h"
@@ -123,5 +121,3 @@ void WebKitInitializeStorageIfNecessary()
 }
 
 @end
-
-#endif
index d3d3604..688b4bc 100644 (file)
@@ -23,8 +23,4 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
  
-#if ENABLE(DOM_STORAGE)
-
 void WebKitInitializeStorageIfNecessary();
-
-#endif
index d3c190c..25dd941 100644 (file)
@@ -23,8 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
  
-#if ENABLE(DOM_STORAGE)
-
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/StorageTrackerClient.h>
 
@@ -41,5 +39,3 @@ public:
 private:
     WebStorageTrackerClient();
 };
-
-#endif
index 01bb981..61b2d17 100644 (file)
@@ -23,8 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if ENABLE(DOM_STORAGE)
-
 #import "WebStorageTrackerClient.h"
 
 #import "WebSecurityOriginInternal.h"
@@ -78,5 +76,3 @@ void WebStorageTrackerClient::dispatchDidModifyOrigin(const String& originIdenti
 
     dispatchDidModifyOrigin(origin);
 }
-
-#endif
index 424a3c3..b0c055f 100644 (file)
@@ -706,9 +706,7 @@ static NSString *leakOutlookQuirksUserScriptContents()
         WebKitInitializeDatabasesIfNecessary();
 #endif
 
-#if ENABLE(DOM_STORAGE)
         WebKitInitializeStorageIfNecessary();
-#endif
         WebKitInitializeApplicationCachePathIfNecessary();
         patchMailRemoveAttributesMethod();
         
index 36ce86b..edeb7dc 100644 (file)
@@ -1,3 +1,16 @@
+2011-10-16  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(DOM_STORAGE)
+        https://bugs.webkit.org/show_bug.cgi?id=70189
+
+        Reviewed by Eric Seidel.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+
 2011-10-15  Adam Barth  <abarth@webkit.org>
 
         Rename ENABLE(TILED_BACKING_STORE) to USE(TILED_BACKING_STORE)
index fcf6052..4137deb 100644 (file)
@@ -79,7 +79,6 @@ ENABLE_DATA_TRANSFER_ITEMS = ;
 ENABLE_DETAILS = ENABLE_DETAILS;
 ENABLE_DEVICE_ORIENTATION = ;
 ENABLE_DIRECTORY_UPLOAD = ;
-ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
 ENABLE_FILE_SYSTEM = ;
 ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
 ENABLE_GAMEPAD = ;
@@ -115,4 +114,4 @@ ENABLE_WORKERS = ENABLE_WORKERS;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 7c6c0b5..f78e1e7 100644 (file)
@@ -1696,9 +1696,7 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
     settings->setFullScreenEnabled(store.getBoolValueForKey(WebPreferencesKey::fullScreenEnabledKey()));
 #endif
 
-#if ENABLE(DOM_STORAGE)
     settings->setLocalStorageDatabasePath(WebProcess::shared().localStorageDirectory());
-#endif
 
 #if USE(AVFOUNDATION)
     settings->setAVFoundationEnabled(store.getBoolValueForKey(WebPreferencesKey::isAVFoundationEnabledKey()));
index 074bfe6..e8aa7ad 100644 (file)
@@ -200,10 +200,8 @@ void WebProcess::initializeWebProcess(const WebProcessCreationParameters& parame
     m_iconDatabaseProxy.setEnabled(parameters.iconDatabaseEnabled);
 #endif
 
-#if ENABLE(DOM_STORAGE)
     StorageTracker::initializeTracker(parameters.localStorageDirectory, 0);
     m_localStorageDirectory = parameters.localStorageDirectory;
-#endif
 
     if (!parameters.applicationCacheDirectory.isEmpty())
         cacheStorage().setCacheDirectory(parameters.applicationCacheDirectory);
index d045a41..1d7beeb 100644 (file)
@@ -66,7 +66,6 @@ WEBKIT_FEATURE(ENABLE_DATAGRID "Enable datagrid" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_DATALIST "Enable datalist" DEFAULT ON HTML)
 WEBKIT_FEATURE(ENABLE_DATA_TRANSFER_ITEMS "Enable data transfer items" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_DEVICE_ORIENTATION "Enable device orientation" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_DOM_STORAGE "Enable DOM storage" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_FAST_MALLOC "Enable TCmalloc instead of system's allocator" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_FAST_MOBILE_SCROLLING "Enable fast mobile scrolling" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_FILTERS "Enable SVG filters" DEFAULT ON SVG)
index 1c8c6aa..60c77f9 100644 (file)
@@ -25,7 +25,6 @@ WEBKIT_FEATURE(ENABLE_SQL_DATABASE "Enable SQL database" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_DATAGRID "Enable datagrid" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_DATALIST "Enable datalist" DEFAULT OFF HTML)
 WEBKIT_FEATURE(ENABLE_DATA_TRANSFER_ITEMS "Enable data transfer items" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_DOM_STORAGE "Enable DOM storage" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_FAST_MOBILE_SCROLLING "Enable fast mobile scrolling" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_FILTERS "Enable SVG filters" DEFAULT OFF SVG)
 WEBKIT_FEATURE(ENABLE_FTPDIR "Enable FTP directory support" DEFAULT OFF)
index e8deaae..811037d 100644 (file)
@@ -13,7 +13,6 @@
 #cmakedefine01 ENABLE_DATALIST
 #cmakedefine01 ENABLE_DATA_TRANSFER_ITEMS
 #cmakedefine01 ENABLE_DEVICE_ORIENTATION
-#cmakedefine01 ENABLE_DOM_STORAGE
 #cmakedefine01 ENABLE_FAST_MOBILE_SCROLLING
 #cmakedefine01 ENABLE_FILTERS
 #cmakedefine01 ENABLE_FTPDIR
index c5a8652..161bafd 100644 (file)
@@ -1,3 +1,13 @@
+2011-10-16  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(DOM_STORAGE)
+        https://bugs.webkit.org/show_bug.cgi?id=70189
+
+        Reviewed by Eric Seidel.
+
+        * Scripts/build-webkit:
+        * waf/build/settings.py:
+
 2011-10-15  Adam Barth  <abarth@webkit.org>
 
         Rename ENABLE(TILED_BACKING_STORE) to USE(TILED_BACKING_STORE)
index 9c79dca..4e3b2af 100755 (executable)
@@ -81,7 +81,6 @@ my (
     $detailsSupport,
     $deviceOrientationSupport,
     $directoryUploadSupport,
-    $domStorageSupport,
     $fileSystemSupport,
     $filtersSupport,
     $fullscreenAPISupport,
@@ -188,9 +187,6 @@ my @features = (
     { option => "mutation-observers", desc => "Toggle DOM mutation observer support",
       define => "ENABLE_MUTATION_OBSERVERS", default => 0, value => \$mutationObserversSupport },
 
-    { option => "dom-storage", desc => "Toggle DOM Storage Support",
-      define => "ENABLE_DOM_STORAGE", default => 1, value => \$domStorageSupport },
-
     { option => "file-system", desc => "Toggle FileSystem support",
       define => "ENABLE_FILE_SYSTEM", default => 0, value => \$fileSystemSupport },
 
index 63123ab..f9bc369 100644 (file)
@@ -238,7 +238,7 @@ def common_configure(conf):
 
     feature_defines = ['ENABLE_DATABASE', 'ENABLE_XSLT', 'ENABLE_JAVASCRIPT_DEBUGGER',
                     'ENABLE_SVG', 'ENABLE_FILTERS', 'ENABLE_SVG_FONTS',
-                    'ENABLE_DOM_STORAGE', 'BUILDING_%s' % build_port.upper()]
+                    'BUILDING_%s' % build_port.upper()]
 
     conf.env["FEATURE_DEFINES"] = ' '.join(feature_defines)
 
index 540d2e4..6c5de2b 100644 (file)
@@ -1,3 +1,13 @@
+2011-10-16  Adam Barth  <abarth@webkit.org>
+
+        Always enable ENABLE(DOM_STORAGE)
+        https://bugs.webkit.org/show_bug.cgi?id=70189
+
+        Reviewed by Eric Seidel.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
 2011-10-14  Dan Bernstein  <mitz@apple.com>
 
         REGRESSION (Safari 5.1 - 5.1.1): CSS nesw-resize cursor shows up as a sw-resize cursor
index 689d529..0c5a61a 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XPATH);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_REQUEST_ANIMATION_FRAME"
         PerformEnvironmentSet="true"
     />
   <UserMacro
-               Name="ENABLE_DOM_STORAGE"
-               Value="ENABLE_DOM_STORAGE"
-               PerformEnvironmentSet="true"
-       />
-  <UserMacro
                Name="ENABLE_FILTERS"
                Value="ENABLE_FILTERS"
                PerformEnvironmentSet="true"
index f65679e..dcc707a 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XPATH);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_3D_CANVAS"
         PerformEnvironmentSet="true"
     />
   <UserMacro
-               Name="ENABLE_DOM_STORAGE"
-               Value="ENABLE_DOM_STORAGE"
-               PerformEnvironmentSet="true"
-       />
-  <UserMacro
                Name="ENABLE_FILTERS"
                Value="ENABLE_FILTERS"
                PerformEnvironmentSet="true"
index 478a1b3..c3251be 100644 (file)
@@ -1154,7 +1154,6 @@ AM_CONDITIONAL([ENABLE_GAMEPAD],[test "$enable_gamepad" = "yes"])
 AM_CONDITIONAL([ENABLE_DIRECTORY_UPLOAD],[test "$enable_directory_upload" = "yes"])
 AM_CONDITIONAL([ENABLE_DATAGRID],[test "$enable_datagrid" = "yes"])
 AM_CONDITIONAL([ENABLE_DATA_TRANSFER_ITEMS],[test "$enable_data_transfer_items" = "yes"])
-AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
 AM_CONDITIONAL([ENABLE_SQL_DATABASE],[test "$enable_sql_database" = "yes"])
 AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"])
 AM_CONDITIONAL([ENABLE_DETAILS],[test "$enable_details" = "yes"])