Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Sep 2011 05:41:19 +0000 (05:41 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Sep 2011 05:41:19 +0000 (05:41 +0000)
https://bugs.webkit.org/show_bug.cgi?id=68205

Reviewed by Eric Seidel.

.:

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

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:
* wtf/Platform.h:

Source/WebCore:

As discussed on webkit-dev.

* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* GNUmakefile.am:
* GNUmakefile.list.am:
* UseJSC.cmake:
* bindings/generic/RuntimeEnabledFeatures.cpp:
* bindings/generic/RuntimeEnabledFeatures.h:
* bindings/js/JSCustomSQLStatementErrorCallback.cpp:
* bindings/js/JSDOMBinding.cpp:
(WebCore::setDOMException):
* bindings/js/JSExceptionBase.cpp:
(WebCore::toExceptionBase):
* bindings/js/JSInjectedScriptHostCustom.cpp:
(WebCore::JSInjectedScriptHost::databaseId):
* bindings/js/JSSQLResultSetRowListCustom.cpp:
* bindings/js/JSSQLTransactionCustom.cpp:
* bindings/js/JSSQLTransactionSyncCustom.cpp:
* bindings/scripts/test/CPP/WebDOMTestCallback.cpp:
* bindings/scripts/test/CPP/WebDOMTestCallback.h:
* bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
* bindings/scripts/test/JS/JSTestCallback.cpp:
* bindings/scripts/test/JS/JSTestCallback.h:
* bindings/scripts/test/ObjC/DOMTestCallback.mm:
* bindings/scripts/test/TestCallback.idl:
* bindings/scripts/test/V8/V8TestCallback.cpp:
* bindings/scripts/test/V8/V8TestCallback.h:
* bindings/v8/V8Proxy.cpp:
(WebCore::V8Proxy::setDOMException):
* bindings/v8/V8Proxy.h:
* bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp:
* bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
(WebCore::V8InjectedScriptHost::databaseIdCallback):
* bindings/v8/custom/V8SQLResultSetRowListCustom.cpp:
* bindings/v8/custom/V8SQLTransactionCustom.cpp:
* bindings/v8/custom/V8SQLTransactionSyncCustom.cpp:
* dom/Document.cpp:
* dom/Document.h:
* dom/ExceptionCode.cpp:
(WebCore::getExceptionCodeDescription):
* dom/ExceptionCode.h:
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::ScriptExecutionContext):
(WebCore::ScriptExecutionContext::~ScriptExecutionContext):
* dom/ScriptExecutionContext.h:
* features.pri:
* history/PageCache.cpp:
(WebCore::logCanCacheFrameDecision):
(WebCore::PageCache::canCachePageContainingThisFrame):
* inspector/InjectedScriptHost.cpp:
(WebCore::InjectedScriptHost::InjectedScriptHost):
(WebCore::InjectedScriptHost::disconnect):
* 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/InspectorDatabaseAgent.cpp:
* inspector/InspectorDatabaseInstrumentation.h:
* inspector/InspectorDatabaseResource.cpp:
* inspector/InspectorDatabaseResource.h:
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didCommitLoadImpl):
* inspector/InspectorInstrumentation.h:
* inspector/InstrumentingAgents.h:
(WebCore::InstrumentingAgents::InstrumentingAgents):
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
(WebCore::WorkerInspectorController::connectFrontend):
* loader/EmptyClients.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::stopLoading):
* page/ChromeClient.h:
* page/DOMWindow.cpp:
* page/DOMWindow.h:
* page/DOMWindow.idl:
* platform/sql/SQLiteAuthorizer.cpp:
* platform/sql/SQLiteDatabase.cpp:
* platform/sql/SQLiteFileSystem.cpp:
* platform/sql/SQLiteStatement.cpp:
* platform/sql/SQLiteTransaction.cpp:
* storage/AbstractDatabase.cpp:
* storage/AbstractDatabase.h:
* storage/ChangeVersionWrapper.cpp:
* storage/ChangeVersionWrapper.h:
* storage/Database.cpp:
* storage/Database.h:
* storage/Database.idl:
* storage/DatabaseAuthorizer.cpp:
* storage/DatabaseCallback.h:
* storage/DatabaseCallback.idl:
* storage/DatabaseDetails.h:
* storage/DatabaseSync.cpp:
* storage/DatabaseSync.h:
* storage/DatabaseSync.idl:
* storage/DatabaseTask.cpp:
* storage/DatabaseTask.h:
* storage/DatabaseThread.cpp:
* storage/DatabaseThread.h:
* storage/DatabaseTracker.cpp:
* storage/DatabaseTracker.h:
* storage/DatabaseTrackerClient.h:
* storage/OriginQuotaManager.cpp:
* storage/OriginQuotaManager.h:
* storage/OriginUsageRecord.cpp:
* storage/OriginUsageRecord.h:
* storage/SQLCallbackWrapper.h:
* storage/SQLError.h:
* storage/SQLError.idl:
* storage/SQLException.h:
* storage/SQLException.idl:
* storage/SQLResultSet.cpp:
* storage/SQLResultSet.h:
* storage/SQLResultSet.idl:
* storage/SQLResultSetRowList.cpp:
* storage/SQLResultSetRowList.h:
* storage/SQLResultSetRowList.idl:
* storage/SQLStatement.cpp:
* storage/SQLStatement.h:
* storage/SQLStatementCallback.h:
* storage/SQLStatementCallback.idl:
* storage/SQLStatementErrorCallback.h:
* storage/SQLStatementErrorCallback.idl:
* storage/SQLStatementSync.cpp:
* storage/SQLStatementSync.h:
* storage/SQLTransaction.cpp:
* storage/SQLTransaction.h:
* storage/SQLTransaction.idl:
* storage/SQLTransactionCallback.h:
* storage/SQLTransactionCallback.idl:
* storage/SQLTransactionClient.cpp:
* storage/SQLTransactionClient.h:
* storage/SQLTransactionCoordinator.cpp:
* storage/SQLTransactionCoordinator.h:
* storage/SQLTransactionErrorCallback.h:
* storage/SQLTransactionErrorCallback.idl:
* storage/SQLTransactionSync.cpp:
* storage/SQLTransactionSync.h:
* storage/SQLTransactionSync.idl:
* storage/SQLTransactionSyncCallback.h:
* storage/SQLTransactionSyncCallback.idl:
* storage/chromium/DatabaseObserver.h:
* storage/chromium/DatabaseTrackerChromium.cpp:
* storage/chromium/QuotaTracker.cpp:
* storage/chromium/QuotaTracker.h:
* storage/chromium/SQLTransactionClientChromium.cpp:
* workers/WorkerContext.cpp:
* workers/WorkerContext.h:
* workers/WorkerContext.idl:
* workers/WorkerThread.cpp:
(WebCore::WorkerThreadShutdownStartTask::performTask):
(WebCore::WorkerThread::stop):

Source/WebKit/chromium:

* src/DatabaseObserver.cpp:
* src/WebDatabase.cpp:
(WebKit::WebDatabase::updateDatabaseSize):
(WebKit::WebDatabase::updateSpaceAvailable):
(WebKit::WebDatabase::resetSpaceAvailable):
(WebKit::WebDatabase::closeDatabaseImmediately):
* src/WebRuntimeFeatures.cpp:
(WebKit::WebRuntimeFeatures::enableDatabase):
(WebKit::WebRuntimeFeatures::isDatabaseEnabled):

Source/WebKit/efl:

* WebCoreSupport/ChromeClientEfl.cpp:
* WebCoreSupport/ChromeClientEfl.h:
* ewk/ewk_settings.cpp:
(ewk_settings_web_database_default_quota_get):
(ewk_settings_web_database_path_set):
(ewk_settings_web_database_path_get):

Source/WebKit/gtk:

* WebCoreSupport/ChromeClientGtk.cpp:
* WebCoreSupport/ChromeClientGtk.h:
* webkit/webkitsecurityorigin.cpp:
(webkit_security_origin_get_web_database_usage):
(webkit_security_origin_get_web_database_quota):
(webkit_security_origin_set_web_database_quota):
(webkit_security_origin_get_all_web_databases):
* webkit/webkitwebdatabase.cpp:
(webkit_web_database_get_display_name):
(webkit_web_database_get_expected_size):
(webkit_web_database_get_size):
(webkit_web_database_get_filename):
(webkit_web_database_remove):
(webkit_remove_all_web_databases):
(webkit_get_web_database_directory_path):
(webkit_set_web_database_directory_path):
* webkit/webkitwebview.cpp:
(webkit_web_view_update_settings):
(webkit_web_view_settings_notify):

Source/WebKit/haiku:

* WebCoreSupport/ChromeClientHaiku.h:

Source/WebKit/mac:

* Storage/WebDatabaseManager.mm:
* Storage/WebDatabaseManagerInternal.h:
* Storage/WebDatabaseManagerPrivate.h:
* Storage/WebDatabaseQuotaManager.mm:
(-[WebDatabaseQuotaManager usage]):
(-[WebDatabaseQuotaManager quota]):
(-[WebDatabaseQuotaManager setQuota:]):
* Storage/WebDatabaseTrackerClient.h:
* Storage/WebDatabaseTrackerClient.mm:
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
* WebCoreSupport/WebSecurityOrigin.mm:
(-[WebSecurityOrigin usage]):
(-[WebSecurityOrigin quota]):
(-[WebSecurityOrigin setQuota:]):
* WebView/WebFrame.mm:
(-[WebFrame _cacheabilityDictionary]):
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
(-[WebView _preferencesChanged:]):

Source/WebKit/qt:

* Api/qwebdatabase.cpp:
(QWebDatabase::displayName):
(QWebDatabase::expectedSize):
(QWebDatabase::size):
(QWebDatabase::fileName):
(QWebDatabase::removeDatabase):
(QWebDatabase::removeAllDatabases):
* Api/qwebsecurityorigin.cpp:
(QWebSecurityOrigin::databaseUsage):
(QWebSecurityOrigin::databaseQuota):
(QWebSecurityOrigin::setDatabaseQuota):
(QWebSecurityOrigin::allOrigins):
(QWebSecurityOrigin::databases):
* Api/qwebsettings.cpp:
(QWebSettingsPrivate::apply):
(QWebSettings::setOfflineStoragePath):
(QWebSettings::offlineStoragePath):
* WebCoreSupport/ChromeClientQt.cpp:
* WebCoreSupport/ChromeClientQt.h:

Source/WebKit/win:

* ForEachCoClass.h:
* WebCoreSupport/WebChromeClient.cpp:
* WebCoreSupport/WebChromeClient.h:
* WebDatabaseManager.cpp:
* WebDatabaseManager.h:
* WebSecurityOrigin.cpp:
(WebSecurityOrigin::usage):
(WebSecurityOrigin::quota):
(WebSecurityOrigin::setQuota):
* WebView.cpp:
(WebView::initWithFrame):
(WebView::notifyPreferencesChanged):

Source/WebKit/wince:

* WebCoreSupport/ChromeClientWinCE.cpp:
* WebCoreSupport/ChromeClientWinCE.h:

Source/WebKit/wx:

* WebKitSupport/ChromeClientWx.cpp:
* WebKitSupport/ChromeClientWx.h:
* WebView.cpp:
(wxWebView::Create):
(wxWebView::SetDatabaseDirectory):
(wxWebView::GetDatabaseDirectory):
(wxWebView::SetDatabasesEnabled):
(wxWebView::AreDatabasesEnabled):

Source/WebKit2:

* WebProcess/WebCoreSupport/WebChromeClient.cpp:
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):

WebKitLibraries:

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

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

199 files changed:
ChangeLog
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/JavaScriptCore/wtf/Platform.h
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.pro
Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp
Source/WebCore/bindings/js/JSDOMBinding.cpp
Source/WebCore/bindings/js/JSExceptionBase.cpp
Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp
Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp
Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp
Source/WebCore/bindings/js/JSSQLTransactionSyncCustom.cpp
Source/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp
Source/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp
Source/WebCore/bindings/scripts/test/JS/JSTestCallback.h
Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm
Source/WebCore/bindings/scripts/test/TestCallback.idl
Source/WebCore/bindings/scripts/test/V8/V8TestCallback.cpp
Source/WebCore/bindings/scripts/test/V8/V8TestCallback.h
Source/WebCore/bindings/v8/V8Proxy.cpp
Source/WebCore/bindings/v8/V8Proxy.h
Source/WebCore/bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp
Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
Source/WebCore/bindings/v8/custom/V8SQLResultSetRowListCustom.cpp
Source/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp
Source/WebCore/bindings/v8/custom/V8SQLTransactionSyncCustom.cpp
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/Document.h
Source/WebCore/dom/ExceptionCode.cpp
Source/WebCore/dom/ExceptionCode.h
Source/WebCore/dom/ScriptExecutionContext.cpp
Source/WebCore/dom/ScriptExecutionContext.h
Source/WebCore/features.pri
Source/WebCore/history/PageCache.cpp
Source/WebCore/inspector/InjectedScriptHost.cpp
Source/WebCore/inspector/InjectedScriptHost.h
Source/WebCore/inspector/InspectorController.cpp
Source/WebCore/inspector/InspectorController.h
Source/WebCore/inspector/InspectorDatabaseAgent.cpp
Source/WebCore/inspector/InspectorDatabaseInstrumentation.h
Source/WebCore/inspector/InspectorDatabaseResource.cpp
Source/WebCore/inspector/InspectorDatabaseResource.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/loader/EmptyClients.h
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/page/ChromeClient.h
Source/WebCore/page/DOMWindow.cpp
Source/WebCore/page/DOMWindow.h
Source/WebCore/page/DOMWindow.idl
Source/WebCore/platform/sql/SQLiteAuthorizer.cpp
Source/WebCore/platform/sql/SQLiteDatabase.cpp
Source/WebCore/platform/sql/SQLiteFileSystem.cpp
Source/WebCore/platform/sql/SQLiteStatement.cpp
Source/WebCore/platform/sql/SQLiteTransaction.cpp
Source/WebCore/storage/AbstractDatabase.cpp
Source/WebCore/storage/AbstractDatabase.h
Source/WebCore/storage/ChangeVersionWrapper.cpp
Source/WebCore/storage/ChangeVersionWrapper.h
Source/WebCore/storage/Database.cpp
Source/WebCore/storage/Database.h
Source/WebCore/storage/Database.idl
Source/WebCore/storage/DatabaseAuthorizer.cpp
Source/WebCore/storage/DatabaseCallback.h
Source/WebCore/storage/DatabaseCallback.idl
Source/WebCore/storage/DatabaseDetails.h
Source/WebCore/storage/DatabaseSync.cpp
Source/WebCore/storage/DatabaseSync.h
Source/WebCore/storage/DatabaseSync.idl
Source/WebCore/storage/DatabaseTask.cpp
Source/WebCore/storage/DatabaseTask.h
Source/WebCore/storage/DatabaseThread.cpp
Source/WebCore/storage/DatabaseThread.h
Source/WebCore/storage/DatabaseTracker.cpp
Source/WebCore/storage/DatabaseTracker.h
Source/WebCore/storage/DatabaseTrackerClient.h
Source/WebCore/storage/OriginQuotaManager.cpp
Source/WebCore/storage/OriginQuotaManager.h
Source/WebCore/storage/OriginUsageRecord.cpp
Source/WebCore/storage/OriginUsageRecord.h
Source/WebCore/storage/SQLCallbackWrapper.h
Source/WebCore/storage/SQLError.h
Source/WebCore/storage/SQLError.idl
Source/WebCore/storage/SQLException.h
Source/WebCore/storage/SQLException.idl
Source/WebCore/storage/SQLResultSet.cpp
Source/WebCore/storage/SQLResultSet.h
Source/WebCore/storage/SQLResultSet.idl
Source/WebCore/storage/SQLResultSetRowList.cpp
Source/WebCore/storage/SQLResultSetRowList.h
Source/WebCore/storage/SQLResultSetRowList.idl
Source/WebCore/storage/SQLStatement.cpp
Source/WebCore/storage/SQLStatement.h
Source/WebCore/storage/SQLStatementCallback.h
Source/WebCore/storage/SQLStatementCallback.idl
Source/WebCore/storage/SQLStatementErrorCallback.h
Source/WebCore/storage/SQLStatementErrorCallback.idl
Source/WebCore/storage/SQLStatementSync.cpp
Source/WebCore/storage/SQLStatementSync.h
Source/WebCore/storage/SQLTransaction.cpp
Source/WebCore/storage/SQLTransaction.h
Source/WebCore/storage/SQLTransaction.idl
Source/WebCore/storage/SQLTransactionCallback.h
Source/WebCore/storage/SQLTransactionCallback.idl
Source/WebCore/storage/SQLTransactionClient.cpp
Source/WebCore/storage/SQLTransactionClient.h
Source/WebCore/storage/SQLTransactionCoordinator.cpp
Source/WebCore/storage/SQLTransactionCoordinator.h
Source/WebCore/storage/SQLTransactionErrorCallback.h
Source/WebCore/storage/SQLTransactionErrorCallback.idl
Source/WebCore/storage/SQLTransactionSync.cpp
Source/WebCore/storage/SQLTransactionSync.h
Source/WebCore/storage/SQLTransactionSync.idl
Source/WebCore/storage/SQLTransactionSyncCallback.h
Source/WebCore/storage/SQLTransactionSyncCallback.idl
Source/WebCore/storage/chromium/DatabaseObserver.h
Source/WebCore/storage/chromium/DatabaseTrackerChromium.cpp
Source/WebCore/storage/chromium/QuotaTracker.cpp
Source/WebCore/storage/chromium/QuotaTracker.h
Source/WebCore/storage/chromium/SQLTransactionClientChromium.cpp
Source/WebCore/workers/WorkerContext.cpp
Source/WebCore/workers/WorkerContext.h
Source/WebCore/workers/WorkerContext.idl
Source/WebCore/workers/WorkerThread.cpp
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/DatabaseObserver.cpp
Source/WebKit/chromium/src/WebDatabase.cpp
Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
Source/WebKit/efl/ewk/ewk_settings.cpp
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
Source/WebKit/gtk/webkit/webkitsecurityorigin.cpp
Source/WebKit/gtk/webkit/webkitwebdatabase.cpp
Source/WebKit/gtk/webkit/webkitwebview.cpp
Source/WebKit/haiku/ChangeLog
Source/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Storage/WebDatabaseManager.mm
Source/WebKit/mac/Storage/WebDatabaseManagerInternal.h
Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h
Source/WebKit/mac/Storage/WebDatabaseQuotaManager.mm
Source/WebKit/mac/Storage/WebDatabaseTrackerClient.h
Source/WebKit/mac/Storage/WebDatabaseTrackerClient.mm
Source/WebKit/mac/WebCoreSupport/WebChromeClient.h
Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
Source/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm
Source/WebKit/mac/WebView/WebFrame.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/qt/Api/qwebdatabase.cpp
Source/WebKit/qt/Api/qwebsecurityorigin.cpp
Source/WebKit/qt/Api/qwebsettings.cpp
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
Source/WebKit/win/ChangeLog
Source/WebKit/win/ForEachCoClass.h
Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp
Source/WebKit/win/WebCoreSupport/WebChromeClient.h
Source/WebKit/win/WebDatabaseManager.cpp
Source/WebKit/win/WebDatabaseManager.h
Source/WebKit/win/WebSecurityOrigin.cpp
Source/WebKit/win/WebView.cpp
Source/WebKit/wince/ChangeLog
Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp
Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h
Source/WebKit/wx/ChangeLog
Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
Source/WebKit/wx/WebKitSupport/ChromeClientWx.h
Source/WebKit/wx/WebView.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebProcess.cpp
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsWinCE.cmake
Source/cmakeconfig.h.cmake
Tools/Scripts/build-webkit
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
configure.ac

index 66e65de..260d37e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/OptionsWinCE.cmake:
+        * Source/cmakeconfig.h.cmake:
+        * configure.ac:
+
 2011-09-15  Varun Jain  <varunjain@google.com>
 
         Add method to scroll current node to specific position in Chromium WebKit API
index c337e96..dc7aa9c 100644 (file)
@@ -1,3 +1,13 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * wtf/Platform.h:
+
 2011-09-15  Mark Hahnenberg  <mhahnenberg@apple.com>
 
         Unzip initialization lists and constructors in JSCell hierarchy (7/7)
index ec8a04b..de78802 100644 (file)
@@ -56,7 +56,7 @@ ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
 ENABLE_CSS3_FLEXBOX = ;
 ENABLE_CSS_EXCLUSIONS = ;
 ENABLE_CSS_REGIONS = ;
-ENABLE_DATABASE = ENABLE_DATABASE;
+ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
 ENABLE_DATA_TRANSFER_ITEMS = ;
 ENABLE_DETAILS = ENABLE_DETAILS;
 ENABLE_DEVICE_ORIENTATION = ;
@@ -97,4 +97,4 @@ ENABLE_XHTMLMP = ;
 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_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(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_XHTMLMP) $(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_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_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(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_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 0ece7b6..84d9f17 100644 (file)
 #define ENABLE_ICONDATABASE 1
 #endif
 
-#if !defined(ENABLE_DATABASE)
-#define ENABLE_DATABASE 1
+#if !defined(ENABLE_SQL_DATABASE)
+#define ENABLE_SQL_DATABASE 1
 #endif
 
 #if !defined(ENABLE_JAVASCRIPT_DEBUGGER)
index c750b12..ae2fb83 100644 (file)
@@ -1402,7 +1402,7 @@ IF (ENABLE_BLOB)
     )
 ENDIF ()
 
-IF (ENABLE_DATABASE)
+IF (ENABLE_SQL_DATABASE)
     LIST(APPEND WebCore_SOURCES
         platform/sql/SQLValue.cpp
         platform/sql/SQLiteAuthorizer.cpp
index 4c88a5b..6a4e0ba 100644 (file)
@@ -1,3 +1,167 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        As discussed on webkit-dev.
+
+        * CMakeLists.txt:
+        * Configurations/FeatureDefines.xcconfig:
+        * GNUmakefile.am:
+        * GNUmakefile.list.am:
+        * UseJSC.cmake:
+        * bindings/generic/RuntimeEnabledFeatures.cpp:
+        * bindings/generic/RuntimeEnabledFeatures.h:
+        * bindings/js/JSCustomSQLStatementErrorCallback.cpp:
+        * bindings/js/JSDOMBinding.cpp:
+        (WebCore::setDOMException):
+        * bindings/js/JSExceptionBase.cpp:
+        (WebCore::toExceptionBase):
+        * bindings/js/JSInjectedScriptHostCustom.cpp:
+        (WebCore::JSInjectedScriptHost::databaseId):
+        * bindings/js/JSSQLResultSetRowListCustom.cpp:
+        * bindings/js/JSSQLTransactionCustom.cpp:
+        * bindings/js/JSSQLTransactionSyncCustom.cpp:
+        * bindings/scripts/test/CPP/WebDOMTestCallback.cpp:
+        * bindings/scripts/test/CPP/WebDOMTestCallback.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
+        * bindings/scripts/test/JS/JSTestCallback.cpp:
+        * bindings/scripts/test/JS/JSTestCallback.h:
+        * bindings/scripts/test/ObjC/DOMTestCallback.mm:
+        * bindings/scripts/test/TestCallback.idl:
+        * bindings/scripts/test/V8/V8TestCallback.cpp:
+        * bindings/scripts/test/V8/V8TestCallback.h:
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::setDOMException):
+        * bindings/v8/V8Proxy.h:
+        * bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp:
+        * bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
+        (WebCore::V8InjectedScriptHost::databaseIdCallback):
+        * bindings/v8/custom/V8SQLResultSetRowListCustom.cpp:
+        * bindings/v8/custom/V8SQLTransactionCustom.cpp:
+        * bindings/v8/custom/V8SQLTransactionSyncCustom.cpp:
+        * dom/Document.cpp:
+        * dom/Document.h:
+        * dom/ExceptionCode.cpp:
+        (WebCore::getExceptionCodeDescription):
+        * dom/ExceptionCode.h:
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::ScriptExecutionContext):
+        (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
+        * dom/ScriptExecutionContext.h:
+        * features.pri:
+        * history/PageCache.cpp:
+        (WebCore::logCanCacheFrameDecision):
+        (WebCore::PageCache::canCachePageContainingThisFrame):
+        * inspector/InjectedScriptHost.cpp:
+        (WebCore::InjectedScriptHost::InjectedScriptHost):
+        (WebCore::InjectedScriptHost::disconnect):
+        * 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/InspectorDatabaseAgent.cpp:
+        * inspector/InspectorDatabaseInstrumentation.h:
+        * inspector/InspectorDatabaseResource.cpp:
+        * inspector/InspectorDatabaseResource.h:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+        * inspector/InspectorInstrumentation.h:
+        * inspector/InstrumentingAgents.h:
+        (WebCore::InstrumentingAgents::InstrumentingAgents):
+        * inspector/WorkerInspectorController.cpp:
+        (WebCore::WorkerInspectorController::WorkerInspectorController):
+        (WebCore::WorkerInspectorController::connectFrontend):
+        * loader/EmptyClients.h:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::stopLoading):
+        * page/ChromeClient.h:
+        * page/DOMWindow.cpp:
+        * page/DOMWindow.h:
+        * page/DOMWindow.idl:
+        * platform/sql/SQLiteAuthorizer.cpp:
+        * platform/sql/SQLiteDatabase.cpp:
+        * platform/sql/SQLiteFileSystem.cpp:
+        * platform/sql/SQLiteStatement.cpp:
+        * platform/sql/SQLiteTransaction.cpp:
+        * storage/AbstractDatabase.cpp:
+        * storage/AbstractDatabase.h:
+        * storage/ChangeVersionWrapper.cpp:
+        * storage/ChangeVersionWrapper.h:
+        * storage/Database.cpp:
+        * storage/Database.h:
+        * storage/Database.idl:
+        * storage/DatabaseAuthorizer.cpp:
+        * storage/DatabaseCallback.h:
+        * storage/DatabaseCallback.idl:
+        * storage/DatabaseDetails.h:
+        * storage/DatabaseSync.cpp:
+        * storage/DatabaseSync.h:
+        * storage/DatabaseSync.idl:
+        * storage/DatabaseTask.cpp:
+        * storage/DatabaseTask.h:
+        * storage/DatabaseThread.cpp:
+        * storage/DatabaseThread.h:
+        * storage/DatabaseTracker.cpp:
+        * storage/DatabaseTracker.h:
+        * storage/DatabaseTrackerClient.h:
+        * storage/OriginQuotaManager.cpp:
+        * storage/OriginQuotaManager.h:
+        * storage/OriginUsageRecord.cpp:
+        * storage/OriginUsageRecord.h:
+        * storage/SQLCallbackWrapper.h:
+        * storage/SQLError.h:
+        * storage/SQLError.idl:
+        * storage/SQLException.h:
+        * storage/SQLException.idl:
+        * storage/SQLResultSet.cpp:
+        * storage/SQLResultSet.h:
+        * storage/SQLResultSet.idl:
+        * storage/SQLResultSetRowList.cpp:
+        * storage/SQLResultSetRowList.h:
+        * storage/SQLResultSetRowList.idl:
+        * storage/SQLStatement.cpp:
+        * storage/SQLStatement.h:
+        * storage/SQLStatementCallback.h:
+        * storage/SQLStatementCallback.idl:
+        * storage/SQLStatementErrorCallback.h:
+        * storage/SQLStatementErrorCallback.idl:
+        * storage/SQLStatementSync.cpp:
+        * storage/SQLStatementSync.h:
+        * storage/SQLTransaction.cpp:
+        * storage/SQLTransaction.h:
+        * storage/SQLTransaction.idl:
+        * storage/SQLTransactionCallback.h:
+        * storage/SQLTransactionCallback.idl:
+        * storage/SQLTransactionClient.cpp:
+        * storage/SQLTransactionClient.h:
+        * storage/SQLTransactionCoordinator.cpp:
+        * storage/SQLTransactionCoordinator.h:
+        * storage/SQLTransactionErrorCallback.h:
+        * storage/SQLTransactionErrorCallback.idl:
+        * storage/SQLTransactionSync.cpp:
+        * storage/SQLTransactionSync.h:
+        * storage/SQLTransactionSync.idl:
+        * storage/SQLTransactionSyncCallback.h:
+        * storage/SQLTransactionSyncCallback.idl:
+        * storage/chromium/DatabaseObserver.h:
+        * storage/chromium/DatabaseTrackerChromium.cpp:
+        * storage/chromium/QuotaTracker.cpp:
+        * storage/chromium/QuotaTracker.h:
+        * storage/chromium/SQLTransactionClientChromium.cpp:
+        * workers/WorkerContext.cpp:
+        * workers/WorkerContext.h:
+        * workers/WorkerContext.idl:
+        * workers/WorkerThread.cpp:
+        (WebCore::WorkerThreadShutdownStartTask::performTask):
+        (WebCore::WorkerThread::stop):
+
 2011-09-15  Alexandru Chiculita  <achicu@adobe.com>
 
         [CSSRegions] Regions should not slice line box rendering
index e6d4919..87bf387 100644 (file)
@@ -54,7 +54,7 @@ ENABLE_ACCELERATED_2D_CANVAS = ;
 ENABLE_ANIMATION_API = ;
 ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
 ENABLE_CSS3_FLEXBOX = ;
-ENABLE_DATABASE = ENABLE_DATABASE;
+ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
 ENABLE_DATA_TRANSFER_ITEMS = ;
 ENABLE_DETAILS = ENABLE_DETAILS;
 ENABLE_DEVICE_ORIENTATION = ;
@@ -96,4 +96,4 @@ ENABLE_XHTMLMP = ;
 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_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(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_XHTMLMP) $(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_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(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_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index a221fd8..a8e6b2e 100644 (file)
@@ -183,12 +183,12 @@ endif # END ENABLE_OFFLINE_WEB_APPLICATIONS
 # ----
 # Database Support
 # ----
-if ENABLE_DATABASE
-FEATURE_DEFINES += ENABLE_DATABASE=1
-webcore_cppflags += -DENABLE_DATABASE=1
+if ENABLE_SQL_DATABASE
+FEATURE_DEFINES += ENABLE_SQL_DATABASE=1
+webcore_cppflags += -DENABLE_SQL_DATABASE=1
 else
-webcore_cppflags += -DENABLE_DATABASE=0
-endif # END ENABLE_DATABASE
+webcore_cppflags += -DENABLE_SQL_DATABASE=0
+endif # END ENABLE_SQL_DATABASE
 
 # ----
 # HTML5 datalist Support
index 2f9e475..e45b76f 100644 (file)
@@ -4114,7 +4114,7 @@ endif # END ENABLE_OFFLINE_WEB_APPLICATIONS
 # ----
 # Database Support
 # ----
-if ENABLE_DATABASE
+if ENABLE_SQL_DATABASE
 webcore_built_sources += \
        DerivedSources/WebCore/JSDatabase.cpp \
        DerivedSources/WebCore/JSDatabase.h \
@@ -4139,7 +4139,7 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSSQLTransactionSync.cpp \
        DerivedSources/WebCore/JSSQLTransactionSyncCallback.cpp \
        DerivedSources/WebCore/JSSQLTransactionSyncCallback.h
-endif # END ENABLE_DATABASE
+endif # END ENABLE_SQL_DATABASE
 
 # ----
 # HTML5 data transfer items support
index cf5d779..77f2640 100644 (file)
@@ -165,7 +165,7 @@ IF (ENABLE_BLOB)
     )
 ENDIF ()
 
-IF (ENABLE_DATABASE)
+IF (ENABLE_SQL_DATABASE)
     LIST(APPEND WebCore_SOURCES
         bindings/js/JSCustomSQLStatementErrorCallback.cpp
         bindings/js/JSSQLResultSetRowListCustom.cpp
index c269097..79388a5 100644 (file)
@@ -2741,7 +2741,7 @@ contains(DEFINES, ENABLE_SQLITE=1) {
 }
 
 
-contains(DEFINES, ENABLE_DATABASE=1) {
+contains(DEFINES, ENABLE_SQL_DATABASE=1) {
     SOURCES += \
         storage/ChangeVersionWrapper.cpp \
         storage/DatabaseTask.cpp \
index 7fb7cf2..32676a8 100644 (file)
@@ -135,7 +135,7 @@ bool RuntimeEnabledFeatures::webSocketEnabled()
 }
 #endif
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 bool RuntimeEnabledFeatures::openDatabaseEnabled()
 {
     return AbstractDatabase::isAvailable();
index 042f816..7232b01 100644 (file)
@@ -98,7 +98,7 @@ public:
     static bool webSocketEnabled();
 #endif
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     static bool openDatabaseEnabled();
     static bool openDatabaseSyncEnabled();
 #endif
index 8576518..5525ca3 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "JSSQLStatementErrorCallback.h"
 
@@ -69,4 +69,4 @@ bool JSSQLStatementErrorCallback::handleEvent(SQLTransaction* transaction, SQLEr
 
 }
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 4dbabb6..f796b6f 100644 (file)
@@ -38,7 +38,7 @@
 #include "JSOperationNotAllowedException.h"
 #endif
 #include "JSRangeException.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 #include "JSSQLException.h"
 #endif
 #if ENABLE(SVG)
@@ -238,7 +238,7 @@ void setDOMException(ExecState* exec, ExceptionCode ec)
             errorObject = toJS(exec, globalObject, XPathException::create(description));
             break;
 #endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         case SQLExceptionType:
             errorObject = toJS(exec, globalObject, SQLException::create(description));
             break;
index 44b38ec..efcb092 100644 (file)
@@ -30,7 +30,7 @@
 #include "JSEventException.h"
 #include "JSRangeException.h"
 #include "JSXMLHttpRequestException.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 #include "SQLException.h"
 #include "JSSQLException.h"
 #endif
@@ -61,7 +61,7 @@ ExceptionBase* toExceptionBase(JSC::JSValue value)
     if (XPathException* pathException = toXPathException(value))
         return reinterpret_cast<ExceptionBase*>(pathException);
 #endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     if (SQLException* pathException = toSQLException(value))
         return reinterpret_cast<ExceptionBase*>(pathException);
 #endif
index 2e781b8..7f9f99e 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "JSInjectedScriptHost.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 #include "Database.h"
 #include "JSDatabase.h"
 #endif
@@ -171,7 +171,7 @@ JSValue JSInjectedScriptHost::databaseId(ExecState* exec)
 {
     if (exec->argumentCount() < 1)
         return jsUndefined();
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     Database* database = toDatabase(exec->argument(0));
     if (database)
         return jsNumber(impl()->databaseIdImpl(database));
index dd9a07b..4800355 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "JSSQLResultSetRowList.h"
 
@@ -83,4 +83,4 @@ JSValue JSSQLResultSetRowList::item(ExecState* exec)
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 2ce9015..27e2cf3 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "JSSQLTransaction.h"
 
@@ -119,4 +119,4 @@ JSValue JSSQLTransaction::executeSql(ExecState* exec)
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index da7a98e..eb56f28 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "JSSQLTransactionSync.h"
 
@@ -96,4 +96,4 @@ JSValue JSSQLTransactionSync::executeSql(ExecState* exec)
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index d12d0c3..483b257 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "WebDOMTestCallback.h"
 
@@ -135,4 +135,4 @@ WebDOMTestCallback toWebKit(WebCore::TestCallback* value)
     return WebDOMTestCallback(value);
 }
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 8d11a4b..1a55a35 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef WebDOMTestCallback_h
 #define WebDOMTestCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <WebDOMObject.h>
 #include <WebDOMString.h>
@@ -65,5 +65,5 @@ WebCore::TestCallback* toWebCore(const WebDOMTestCallback&);
 WebDOMTestCallback toWebKit(WebCore::TestCallback*);
 
 #endif
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
index b63f50e..84a3620 100644 (file)
@@ -21,7 +21,7 @@
 #include <glib-object.h>
 #include "config.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/GetPtr.h>
 #include <wtf/RefPtr.h>
@@ -232,4 +232,4 @@ WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback* coreObject)
                                                "core-object", coreObject, NULL));
 }
 } // namespace WebKit
-#endif /* ENABLE(DATABASE) */
+#endif // ENABLE(SQL_DATABASE)
index eea587c..fc1461b 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "JSTestCallback.h"
 
@@ -130,4 +130,4 @@ bool JSTestCallback::callbackWithStringList(DOMStringList* listParam)
 
 }
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 226e874..a6f3cce 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef JSTestCallback_h
 #define JSTestCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "ActiveDOMCallback.h"
 #include "JSCallbackData.h"
@@ -55,6 +55,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif
index e070de5..9b0866c 100644 (file)
@@ -26,7 +26,7 @@
 
 #import "config.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #import "DOMInternal.h"
 
@@ -138,4 +138,4 @@ DOMTestCallback *kit(WebCore::TestCallback* value)
     return [wrapper autorelease];
 }
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 9e1b1bd..8514eee 100644 (file)
@@ -30,7 +30,7 @@
 // that has the "Callback" attribute and for tracking changes in its ouput.
 module test {
     interface [
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         LegacyDefaultOptionalArguments,
         Callback
     ] TestCallback {
index 807ad4f..8577a93 100644 (file)
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "V8TestCallback.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "ScriptExecutionContext.h"
 #include "V8Binding.h"
@@ -161,4 +161,4 @@ bool V8TestCallback::callbackWithStringList(RefPtr<DOMStringList> listParam)
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index e414e3a..72980f2 100644 (file)
@@ -18,7 +18,7 @@
     Boston, MA 02111-1307, USA.
 */
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #ifndef V8TestCallback_h
 #define V8TestCallback_h
@@ -63,4 +63,4 @@ private:
 
 #endif // V8TestCallback_h
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 99bc5dd..a39cfaf 100644 (file)
@@ -675,7 +675,7 @@ void V8Proxy::setDOMException(int exceptionCode)
         exception = toV8(XPathException::create(description));
         break;
 #endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     case SQLExceptionType:
         exception = toV8(SQLException::create(description));
         break;
index 169f7a5..faf66e7 100644 (file)
@@ -302,7 +302,7 @@ namespace WebCore {
         static const char* svgExceptionName(int exceptionCode);
 #endif
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         static const char* sqlExceptionName(int exceptionCode);
 #endif
 
index 9f98f39..8c54b81 100644 (file)
@@ -169,7 +169,7 @@ v8::Handle<v8::Value> V8InjectedScriptHost::databaseIdCallback(const v8::Argumen
     INC_STATS("InjectedScriptHost.databaseId()");
     if (args.Length() < 1)
         return v8::Undefined();
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     InjectedScriptHost* host = V8InjectedScriptHost::toNative(args.Holder());
     Database* database = V8Database::toNative(v8::Handle<v8::Object>::Cast(args[0]));
     if (database)
index 63d0a97..86531ab 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 #include "V8SQLResultSetRowList.h"
 
 #include "SQLResultSetRowList.h"
index cba69b9..92dac70 100644 (file)
@@ -4564,7 +4564,7 @@ void Document::setSecurityOrigin(SecurityOrigin* securityOrigin)
     initDNSPrefetch();
 }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 bool Document::allowDatabaseAccess() const
 {
index 5575c5e..0ea5305 100644 (file)
@@ -1008,7 +1008,7 @@ public:
     bool processingLoadEvent() const { return m_processingLoadEvent; }
     bool loadEventFinished() const { return m_loadEventFinished; }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     virtual bool allowDatabaseAccess() const;
     virtual void databaseExceededQuota(const String& name);
 #endif
index 6d3599f..bb602ac 100644 (file)
@@ -39,7 +39,7 @@
 #include "XPathException.h"
 #endif
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 #include "SQLException.h"
 #endif
 
@@ -163,7 +163,7 @@ static const char* const svgExceptionDescriptions[] = {
 };
 #endif
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 static const char* const sqlExceptionNames[] = {
     "UNKNOWN_ERR",
     "DATABASE_ERR",
@@ -319,7 +319,7 @@ void getExceptionCodeDescription(ExceptionCode ec, ExceptionCodeDescription& des
         nameTableSize = WTF_ARRAY_LENGTH(svgExceptionNames);
         nameTableOffset = SVGException::SVG_WRONG_TYPE_ERR;
 #endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     } else if (code >= SQLException::SQLExceptionOffset && code <= SQLException::SQLExceptionMax) {
         type = SQLExceptionType;
         typeName = "DOM SQL";
index cea6f67..6579731 100644 (file)
@@ -74,7 +74,7 @@ namespace WebCore {
 #if ENABLE(SVG)
         , SVGExceptionType
 #endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         , SQLExceptionType
 #endif
 #if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
index a882bef..6216d8b 100644 (file)
@@ -91,7 +91,7 @@ ScriptExecutionContext::ScriptExecutionContext()
     : m_iteratingActiveDOMObjects(false)
     , m_inDestructor(false)
     , m_inDispatchErrorEvent(false)
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     , m_hasOpenDatabases(false)
 #endif
 {
@@ -112,7 +112,7 @@ ScriptExecutionContext::~ScriptExecutionContext()
         ASSERT((*iter)->scriptExecutionContext() == this);
         (*iter)->contextDestroyed();
     }
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     if (m_databaseThread) {
         ASSERT(m_databaseThread->terminationRequested());
         m_databaseThread = 0;
@@ -144,7 +144,7 @@ ScriptExecutionContext::~ScriptExecutionContext()
 #endif
 }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 DatabaseThread* ScriptExecutionContext::databaseThread()
 {
index 52d921c..8dee69a 100644 (file)
@@ -56,7 +56,7 @@ namespace WebCore {
     class ScriptCallStack;
     class SecurityOrigin;
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     class Database;
     class DatabaseTaskSynchronizer;
     class DatabaseThread;
@@ -78,7 +78,7 @@ namespace WebCore {
         virtual bool isDocument() const { return false; }
         virtual bool isWorkerContext() const { return false; }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         virtual bool allowDatabaseAccess() const = 0;
         virtual void databaseExceededQuota(const String& name) = 0;
         DatabaseThread* databaseThread();
@@ -208,7 +208,7 @@ namespace WebCore {
         class PendingException;
         OwnPtr<Vector<OwnPtr<PendingException> > > m_pendingExceptions;
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         RefPtr<DatabaseThread> m_databaseThread;
         bool m_hasOpenDatabases; // This never changes back to false, even after the database thread is closed.
 #endif
index 871b1fc..416ded1 100644 (file)
@@ -44,10 +44,10 @@ isEmpty(HAVE_QRAWFONT) {
 }
 
 # turn off SQLITE support if we do not have sqlite3 available
-!CONFIG(QTDIR_build):win32-*:!exists( $${SQLITE3SRCDIR}/sqlite3.c ): DEFINES += ENABLE_SQLITE=0 ENABLE_DATABASE=0 ENABLE_WORKERS=0 ENABLE_SHARED_WORKERS=0 ENABLE_ICONDATABASE=0 ENABLE_OFFLINE_WEB_APPLICATIONS=0 ENABLE_DOM_STORAGE=0
+!CONFIG(QTDIR_build):win32-*:!exists( $${SQLITE3SRCDIR}/sqlite3.c ): DEFINES += ENABLE_SQLITE=0 ENABLE_SQL_DATABASE=0 ENABLE_WORKERS=0 ENABLE_SHARED_WORKERS=0 ENABLE_ICONDATABASE=0 ENABLE_OFFLINE_WEB_APPLICATIONS=0 ENABLE_DOM_STORAGE=0
 
 !contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=.): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1
-!contains(DEFINES, ENABLE_DATABASE=.): DEFINES += ENABLE_DATABASE=1
+!contains(DEFINES, ENABLE_SQL_DATABASE=.): DEFINES += ENABLE_SQL_DATABASE=1
 !contains(DEFINES, ENABLE_EVENTSOURCE=.): DEFINES += ENABLE_EVENTSOURCE=1
 !contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=.): DEFINES += ENABLE_OFFLINE_WEB_APPLICATIONS=1
 !contains(DEFINES, ENABLE_DOM_STORAGE=.): DEFINES += ENABLE_DOM_STORAGE=1
@@ -59,7 +59,7 @@ isEmpty(HAVE_QRAWFONT) {
 
 # turn on SQLITE support if any of the dependent features are turned on
 !contains(DEFINES, ENABLE_SQLITE=.) {
-  contains(DEFINES, ENABLE_DATABASE=1)|contains(DEFINES, ENABLE_ICONDATABASE=1)|contains(DEFINES, ENABLE_DOM_STORAGE=1)|contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1) {
+  contains(DEFINES, ENABLE_SQL_DATABASE=1)|contains(DEFINES, ENABLE_ICONDATABASE=1)|contains(DEFINES, ENABLE_DOM_STORAGE=1)|contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1) {
     DEFINES += ENABLE_SQLITE=1
   } else {
     DEFINES += ENABLE_SQLITE=0
@@ -208,7 +208,7 @@ v8: FEATURE_DEFINES_JAVASCRIPT += V8_BINDING=1
 contains(DEFINES, ENABLE_CHANNEL_MESSAGING=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_CHANNEL_MESSAGING=1
 contains(DEFINES, ENABLE_ORIENTATION_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_ORIENTATION_EVENTS=1
 contains(DEFINES, ENABLE_EVENTSOURCE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_EVENTSOURCE=1
-contains(DEFINES, ENABLE_DATABASE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATABASE=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
index 4306cea..166d8c9 100644 (file)
@@ -119,7 +119,7 @@ static bool logCanCacheFrameDecision(Frame* frame, int indentLevel)
             PCLOG("   -Frame has an unload event listener");
             cannotCache = true;
         }
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         if (frame->document()->hasOpenDatabases()) {
             PCLOG("   -Frame has open database handles");
             cannotCache = true;
@@ -265,7 +265,7 @@ bool PageCache::canCachePageContainingThisFrame(Frame* frame)
         && !frame->loader()->subframeLoader()->containsPlugins()
         && !frame->document()->url().protocolIs("https")
         && (!frame->domWindow() || !frame->domWindow()->hasEventListeners(eventNames().unloadEvent))
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         && !frame->document()->hasOpenDatabases()
 #endif
 #if ENABLE(SHARED_WORKERS)
index b5427f8..e711446 100644 (file)
@@ -47,7 +47,7 @@
 #include "InspectorValues.h"
 #include "Pasteboard.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 #include "Database.h"
 #endif
 
@@ -72,7 +72,7 @@ PassRefPtr<InjectedScriptHost> InjectedScriptHost::create()
 InjectedScriptHost::InjectedScriptHost()
     : m_inspectorAgent(0)
     , m_consoleAgent(0)
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     , m_databaseAgent(0)
 #endif
 #if ENABLE(DOM_STORAGE)
@@ -91,7 +91,7 @@ void InjectedScriptHost::disconnect()
 {
     m_inspectorAgent = 0;
     m_consoleAgent = 0;
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     m_databaseAgent = 0;
 #endif
 #if ENABLE(DOM_STORAGE)
@@ -138,7 +138,7 @@ Node* InjectedScriptHost::inspectedNode(unsigned int num)
     return 0;
 }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 int InjectedScriptHost::databaseIdImpl(Database* database)
 {
     if (m_databaseAgent)
index 479f2e8..c491777 100644 (file)
@@ -59,7 +59,7 @@ public:
 
     void init(InspectorAgent* inspectorAgent
             , InspectorConsoleAgent* consoleAgent
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
             , InspectorDatabaseAgent* databaseAgent
 #endif
 #if ENABLE(DOM_STORAGE)
@@ -69,7 +69,7 @@ public:
     {
         m_inspectorAgent = inspectorAgent;
         m_consoleAgent = consoleAgent;
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         m_databaseAgent = databaseAgent;
 #endif
 #if ENABLE(DOM_STORAGE)
@@ -91,7 +91,7 @@ public:
     void clearConsoleMessages();
     void copyText(const String& text);
     Node* inspectedNode(unsigned int num);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     int databaseIdImpl(Database*);
 #endif
 #if ENABLE(DOM_STORAGE)
@@ -108,7 +108,7 @@ private:
 
     InspectorAgent* m_inspectorAgent;
     InspectorConsoleAgent* m_consoleAgent;
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     InspectorDatabaseAgent* m_databaseAgent;
 #endif
 #if ENABLE(DOM_STORAGE)
index 2589aeb..ea31b8c 100644 (file)
@@ -101,7 +101,7 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
     , m_pageAgent(InspectorPageAgent::create(m_instrumentingAgents.get(), page, m_injectedScriptManager.get()))
     , m_domAgent(InspectorDOMAgent::create(m_instrumentingAgents.get(), m_pageAgent.get(), inspectorClient, m_state.get(), m_injectedScriptManager.get()))
     , m_cssAgent(adoptPtr(new InspectorCSSAgent(m_instrumentingAgents.get(), m_domAgent.get())))
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     , m_databaseAgent(InspectorDatabaseAgent::create(m_instrumentingAgents.get(), m_state.get()))
 #endif
 #if ENABLE(DOM_STORAGE)
@@ -130,7 +130,7 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
     ASSERT_ARG(inspectorClient, inspectorClient);
     m_injectedScriptManager->injectedScriptHost()->init(m_inspectorAgent.get()
         , m_consoleAgent.get()
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         , m_databaseAgent.get()
 #endif
 #if ENABLE(DOM_STORAGE)
@@ -214,7 +214,7 @@ void InspectorController::connectFrontend()
     m_debuggerAgent->setFrontend(m_inspectorFrontend.get());
     m_profilerAgent->setFrontend(m_inspectorFrontend.get());
 #endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     m_databaseAgent->setFrontend(m_inspectorFrontend.get());
 #endif
 #if ENABLE(DOM_STORAGE)
@@ -244,7 +244,7 @@ void InspectorController::connectFrontend()
 #if ENABLE(DOM_STORAGE)
         m_domStorageAgent.get(),
 #endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         m_databaseAgent.get(),
 #endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
@@ -293,7 +293,7 @@ void InspectorController::disconnectFrontend()
     m_cssAgent->clearFrontend();
     m_timelineAgent->clearFrontend();
     m_resourceAgent->clearFrontend();
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     m_databaseAgent->clearFrontend();
 #endif
 #if ENABLE(DOM_STORAGE)
@@ -346,7 +346,7 @@ void InspectorController::restoreInspectorStateFromCookie(const String& inspecto
     m_resourceAgent->restore();
     m_timelineAgent->restore();
     m_consoleAgent->restore();
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     m_databaseAgent->restore();
 #endif
 #if ENABLE(DOM_STORAGE)
index a8fd447..ef35136 100644 (file)
@@ -134,7 +134,7 @@ private:
     OwnPtr<InspectorPageAgent> m_pageAgent;
     OwnPtr<InspectorDOMAgent> m_domAgent;
     OwnPtr<InspectorCSSAgent> m_cssAgent;
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     OwnPtr<InspectorDatabaseAgent> m_databaseAgent;
 #endif
 #if ENABLE(DOM_STORAGE)
index 03d8482..fb97336 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "InspectorDatabaseAgent.h"
 
-#if ENABLE(INSPECTOR) && ENABLE(DATABASE)
+#if ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
 
 #include "Database.h"
 #include "ExceptionCode.h"
@@ -357,4 +357,4 @@ Database* InspectorDatabaseAgent::databaseForId(int databaseId)
 
 } // namespace WebCore
 
-#endif // ENABLE(INSPECTOR) && ENABLE(DATABASE)
+#endif // ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
index 1f6d7f7..fd6490b 100644 (file)
@@ -37,7 +37,7 @@
 
 namespace WebCore {
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 inline void InspectorInstrumentation::didOpenDatabase(ScriptExecutionContext* context, PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
 {
 #if ENABLE(INSPECTOR)
index 852370e..8169765 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "InspectorDatabaseResource.h"
 
-#if ENABLE(DATABASE) && ENABLE(INSPECTOR)
+#if ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
 #include "Database.h"
 #include "InspectorFrontend.h"
 #include "InspectorValues.h"
@@ -66,4 +66,4 @@ void InspectorDatabaseResource::bind(InspectorFrontend::Database* frontend)
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE) && ENABLE(INSPECTOR)
+#endif // ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
index 37bae40..483973e 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef InspectorDatabaseResource_h
 #define InspectorDatabaseResource_h
 
-#if ENABLE(DATABASE) && ENABLE(INSPECTOR)
+#if ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
 #include "InspectorFrontend.h"
 #include "PlatformString.h"
 #include <wtf/PassRefPtr.h>
@@ -63,6 +63,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif // InspectorDatabaseResource_h
index 5d0c3fc..49ddfc5 100644 (file)
@@ -643,7 +643,7 @@ void InspectorInstrumentation::didCommitLoadImpl(InstrumentingAgents* instrument
 #endif
         if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())
             cssAgent->reset();
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         if (InspectorDatabaseAgent* databaseAgent = instrumentingAgents->inspectorDatabaseAgent())
             databaseAgent->clearResources();
 #endif
@@ -751,7 +751,7 @@ bool InspectorInstrumentation::profilerEnabledImpl(InstrumentingAgents* instrume
 }
 #endif
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents* instrumentingAgents, PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
 {
     InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
index 6f59ee4..0f693fd 100644 (file)
@@ -166,7 +166,7 @@ public:
     static bool profilerEnabled(Page*);
 #endif
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     static void didOpenDatabase(ScriptExecutionContext*, PassRefPtr<Database>, const String& domain, const String& name, const String& version);
 #endif
 
@@ -300,7 +300,7 @@ private:
     static bool profilerEnabledImpl(InstrumentingAgents*);
 #endif
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     static void didOpenDatabaseImpl(InstrumentingAgents*, PassRefPtr<Database>, const String& domain, const String& name, const String& version);
 #endif
 
index bc80905..3c886a9 100644 (file)
@@ -70,7 +70,7 @@ public:
 #if ENABLE(DOM_STORAGE)
         , m_inspectorDOMStorageAgent(0)
 #endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         , m_inspectorDatabaseAgent(0)
 #endif
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
@@ -115,7 +115,7 @@ public:
     InspectorDOMStorageAgent* inspectorDOMStorageAgent() const { return m_inspectorDOMStorageAgent; }
     void setInspectorDOMStorageAgent(InspectorDOMStorageAgent* agent) { m_inspectorDOMStorageAgent = agent; }
 #endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     InspectorDatabaseAgent* inspectorDatabaseAgent() const { return m_inspectorDatabaseAgent; }
     void setInspectorDatabaseAgent(InspectorDatabaseAgent* agent) { m_inspectorDatabaseAgent = agent; }
 #endif
@@ -150,7 +150,7 @@ private:
 #if ENABLE(DOM_STORAGE)
     InspectorDOMStorageAgent* m_inspectorDOMStorageAgent;
 #endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     InspectorDatabaseAgent* m_inspectorDatabaseAgent;
 #endif
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
index c349927..9a9a449 100644 (file)
@@ -101,7 +101,7 @@ WorkerInspectorController::WorkerInspectorController(WorkerContext* workerContex
 {
     m_injectedScriptManager->injectedScriptHost()->init(0
         , 0
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         , 0
 #endif
 #if ENABLE(DOM_STORAGE)
@@ -138,7 +138,7 @@ void WorkerInspectorController::connectFrontend()
 #if ENABLE(DOM_STORAGE)
         0, // InspectorDOMStorageAgent
 #endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         0, // InspectorDatabaseAgent
 #endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
index 0617d49..fe47ccd 100755 (executable)
@@ -84,7 +84,7 @@ type_traits = {
 ref_types = {}
 
 macro_traits = {
-    "Database": "DATABASE",
+    "Database": "SQL_DATABASE",
     "DOMStorage": "DOM_STORAGE",
     "ApplicationCache": "OFFLINE_WEB_APPLICATIONS",
     "Debugger": "JAVASCRIPT_DEBUGGER",
index 75c535a..f5e7c16 100644 (file)
@@ -180,7 +180,7 @@ public:
 
     virtual void print(Frame*) { }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     virtual void exceededDatabaseQuota(Frame*, const String&) { }
 #endif
 
index f5ba51b..724c676 100644 (file)
@@ -426,7 +426,7 @@ void FrameLoader::stopLoading(UnloadEventPolicy unloadEventPolicy)
         // http://www.w3.org/Bugs/Public/show_bug.cgi?id=10537
         doc->setReadyState(Document::Complete);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         doc->stopDatabases(0);
 #endif
     }
index 0ad7661..34b51a1 100644 (file)
@@ -179,7 +179,7 @@ namespace WebCore {
         virtual void print(Frame*) = 0;
         virtual bool shouldRubberBandInDirection(ScrollDirection) const = 0;
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         virtual void exceededDatabaseQuota(Frame*, const String& databaseName) = 0;
 #endif
 
index 43c2375..b724941 100644 (file)
@@ -1345,7 +1345,7 @@ double DOMWindow::devicePixelRatio() const
     return page->deviceScaleFactor();
 }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 PassRefPtr<Database> DOMWindow::openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
 {
     RefPtr<Database> database = 0;
index a2ad809..32321a1 100644 (file)
@@ -349,8 +349,7 @@ namespace WebCore {
         DOMURL* webkitURL() const;
 #endif
 
-#if ENABLE(DATABASE)
-        // HTML 5 client-side database
+#if ENABLE(SQL_DATABASE)
         PassRefPtr<Database> openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
 #endif
 
index 5fc3d76..fc90782 100644 (file)
@@ -166,7 +166,7 @@ module window {
 #if defined(ENABLE_OFFLINE_WEB_APPLICATIONS) && ENABLE_OFFLINE_WEB_APPLICATIONS
         readonly attribute [EnabledAtRuntime] DOMApplicationCache applicationCache;
 #endif    
-#if defined(ENABLE_DATABASE) && ENABLE_DATABASE
+#if defined(ENABLE_SQL_DATABASE) && ENABLE_SQL_DATABASE
         [EnabledAtRuntime] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
             raises(DOMException);
 #endif
@@ -790,7 +790,7 @@ module window {
 #endif
 #endif
 
-        attribute [Conditional=DATABASE] SQLExceptionConstructor SQLException;
+        attribute [Conditional=SQL_DATABASE] SQLExceptionConstructor SQLException;
 
 
         attribute DOMFormDataConstructor FormData;
index 6fbf79d..acaf609 100644 (file)
@@ -29,7 +29,8 @@
 #include "config.h"
 #include "DatabaseAuthorizer.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
 #include <sqlite3.h>
 
 namespace WebCore {
@@ -40,4 +41,4 @@ const int SQLAuthDeny = SQLITE_DENY;
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 67026f9..4a1b484 100644 (file)
@@ -27,7 +27,8 @@
 #include "config.h"
 #include "SQLiteDatabase.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
 #include "DatabaseAuthorizer.h"
 #include "Logging.h"
 #include "SQLiteFileSystem.h"
@@ -471,4 +472,4 @@ bool SQLiteDatabase::turnOnIncrementalAutoVacuum()
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 362005c..002b969 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "SQLiteFileSystem.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "FileSystem.h"
 #include "SQLiteDatabase.h"
@@ -125,4 +125,5 @@ long long SQLiteFileSystem::getDatabaseFileSize(const String& fileName)
 }
 
 } // namespace WebCore
-#endif // ENABLE(DATABASE)
+
+#endif // ENABLE(SQL_DATABASE)
index 5c95333..946f8d7 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "SQLiteStatement.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "Logging.h"
 #include "SQLValue.h"
@@ -546,4 +546,4 @@ bool SQLiteStatement::isExpired()
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 63b3e7a..376ce4d 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "SQLiteTransaction.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "SQLiteDatabase.h"
 
@@ -103,4 +103,5 @@ bool SQLiteTransaction::wasRolledBackBySqlite() const
 }
 
 } // namespace WebCore
-#endif // ENABLE(DATABASE)
+
+#endif // ENABLE(SQL_DATABASE)
index 9ba0739..f6073e4 100644 (file)
@@ -29,7 +29,8 @@
 #include "config.h"
 #include "AbstractDatabase.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
 #include "DatabaseAuthorizer.h"
 #include "DatabaseTracker.h"
 #include "Logging.h"
@@ -545,4 +546,4 @@ bool AbstractDatabase::isInterrupted()
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 33fd380..a98557f 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef AbstractDatabase_h
 #define AbstractDatabase_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "ExceptionCode.h"
 #include "PlatformString.h"
@@ -133,6 +133,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif // AbstractDatabase_h
index 84195e8..eb7d46c 100644 (file)
@@ -28,7 +28,8 @@
 #include "config.h"
 #include "ChangeVersionWrapper.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
 #include "Database.h"
 #include "SQLError.h"
 #include <wtf/PassRefPtr.h>
@@ -85,4 +86,4 @@ void ChangeVersionWrapper::handleCommitFailedAfterPostflight(SQLTransaction* tra
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 128027e..785fe28 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef ChangeVersionWrapper_h
 #define ChangeVersionWrapper_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "PlatformString.h"
 #include "SQLTransaction.h"
index bf85160..e4e3cda 100644 (file)
@@ -29,7 +29,8 @@
 #include "config.h"
 #include "Database.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
 #include "ChangeVersionWrapper.h"
 #include "DatabaseCallback.h"
 #include "DatabaseTask.h"
@@ -412,4 +413,4 @@ SecurityOrigin* Database::securityOrigin() const
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 47001a4..bed8fc1 100644 (file)
@@ -29,7 +29,8 @@
 #ifndef Database_h
 #define Database_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
 #include "AbstractDatabase.h"
 #include "ExceptionCode.h"
 #include "PlatformString.h"
@@ -115,6 +116,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif // Database_h
index 78acb7f..7bf5a3a 100644 (file)
@@ -29,7 +29,7 @@
 module storage {
 
     interface [
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] Database {
index b90565c..41592cf 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "DatabaseAuthorizer.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "PlatformString.h"
 #include <wtf/PassRefPtr.h>
index 586416a..bfa7bc6 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef DatabaseCallback_h
 #define DatabaseCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/ThreadSafeRefCounted.h>
 
index a40e900..a52e5ce 100644 (file)
@@ -28,7 +28,7 @@
 
 module storage {
     interface [
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         LegacyDefaultOptionalArguments,
         Callback
     ] DatabaseCallback {
index c2217af..f5dc787 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef DatabaseDetails_h
 #define DatabaseDetails_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "PlatformString.h"
 
index bac186b..c2a248e 100644 (file)
@@ -31,7 +31,8 @@
 #include "config.h"
 #include "DatabaseSync.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
 #include "DatabaseCallback.h"
 #include "DatabaseTracker.h"
 #include "Logging.h"
@@ -197,4 +198,4 @@ void DatabaseSync::closeImmediately()
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 6563b23..71a6adb 100644 (file)
@@ -31,7 +31,8 @@
 #ifndef DatabaseSync_h
 #define DatabaseSync_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
 #include "AbstractDatabase.h"
 #include "ExceptionCode.h"
 #include "PlatformString.h"
@@ -70,6 +71,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
-#endif // DatabaseSync_h
+#endif
index ff30b38..4d352a6 100644 (file)
@@ -31,7 +31,7 @@
 module storage {
 
     interface [
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] DatabaseSync {
index e9a4a39..3a12380 100644 (file)
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "DatabaseTask.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "Database.h"
 #include "Logging.h"
index faadc69..4cc83ca 100644 (file)
@@ -28,7 +28,8 @@
 #ifndef DatabaseTask_h
 #define DatabaseTask_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
 #include "Database.h"
 #include "ExceptionCode.h"
 #include "PlatformString.h"
@@ -173,5 +174,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
+
 #endif // DatabaseTask_h
index 3b790ee..cbde324 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "DatabaseThread.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "AutodrainedPool.h"
 #include "Database.h"
index ee1702c..d410edb 100644 (file)
@@ -28,7 +28,8 @@
 #ifndef DatabaseThread_h
 #define DatabaseThread_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
@@ -91,5 +92,5 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 #endif // DatabaseThread_h
index 7fdc214..cd3339f 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "DatabaseTracker.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "AbstractDatabase.h"
 #include "Chrome.h"
index 21cccbe..492c148 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef DatabaseTracker_h
 #define DatabaseTracker_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "PlatformString.h"
 #include <wtf/HashMap.h>
@@ -187,5 +187,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
+
 #endif // DatabaseTracker_h
index 2e0497f..9c08bcd 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef DatabaseTrackerClient_h
 #define DatabaseTrackerClient_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/Forward.h>
 
index 0f415c1..7229704 100644 (file)
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "OriginQuotaManager.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "AbstractDatabase.h"
 #include "OriginUsageRecord.h"
@@ -134,4 +134,4 @@ unsigned long long OriginQuotaManager::diskUsage(SecurityOrigin* origin) const
 
 }
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 82d7c74..974de72 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef OriginQuotaManager_h
 #define OriginQuotaManager_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "SecurityOriginHash.h"
 #include <wtf/HashMap.h>
@@ -71,6 +71,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif // OriginQuotaManager_h
index eac08fd..443550a 100644 (file)
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "OriginUsageRecord.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "SQLiteFileSystem.h"
 
index 7557eaa..61d9c90 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef OriginUsageRecord_h
 #define OriginUsageRecord_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "PlatformString.h"
 #include <wtf/HashMap.h>
index 81e34fa..34c7085 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef SQLCallbackWrapper_h
 #define SQLCallbackWrapper_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "CrossThreadTask.h"
 #include "ScriptExecutionContext.h"
@@ -103,6 +103,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif // SQLCallbackWrapper_h
index eb9005b..6d823b1 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SQLError_h
 #define SQLError_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "PlatformString.h"
 #include <wtf/ThreadSafeRefCounted.h>
index 87be8c7..5c998f2 100644 (file)
@@ -29,7 +29,7 @@
 module storage {
 
     interface [
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] SQLError {
index a0f118d..fc88148 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef SQLException_h
 #define SQLException_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "ExceptionBase.h"
 
@@ -67,6 +67,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif // SQLException_h
index cbbc311..60815dc 100644 (file)
@@ -31,7 +31,7 @@
 module storage {
 
     interface [
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         NoStaticTables,
         DontCheckEnums
     ] SQLException {
index 7482628..c3abcc8 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "SQLResultSet.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 namespace WebCore {
 
index 964504c..a5f9a94 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SQLResultSet_h
 #define SQLResultSet_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "ExceptionCode.h"
 #include "SQLResultSetRowList.h"
index 52f06da..1b48658 100644 (file)
@@ -29,7 +29,7 @@
 module storage {
 
     interface [
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] SQLResultSet {
index c1e4844..c99b40a 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "SQLResultSetRowList.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 namespace WebCore {
 
index 92b5ec0..9fc7195 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SQLResultSetRowList_h
 #define SQLResultSetRowList_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/PassRefPtr.h>
 #include "SQLValue.h"
index 63002fb..f04ee31 100644 (file)
@@ -30,7 +30,7 @@ module storage {
 
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] SQLResultSetRowList {
index 58b7f71..b530325 100644 (file)
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "SQLStatement.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "Database.h"
 #include "Logging.h"
@@ -199,4 +199,4 @@ bool SQLStatement::lastExecutionFailedDueToQuota() const
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 1d81eb2..0002501 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef SQLStatement_h
 #define SQLStatement_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "PlatformString.h"
 #include "SQLCallbackWrapper.h"
@@ -80,6 +80,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif // SQLStatement_h
index cae5827..83201d2 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef SQLStatementCallback_h
 #define SQLStatementCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/ThreadSafeRefCounted.h>
 
index 14cfccd..8bd168d 100644 (file)
@@ -29,7 +29,7 @@
 module storage {
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         Callback
     ] SQLStatementCallback {
         boolean handleEvent(in SQLTransaction transaction, in SQLResultSet resultSet);
index 5fecec4..c7c9f54 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SQLStatementErrorCallback_h
 #define SQLStatementErrorCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/ThreadSafeRefCounted.h>
 
index 1710380..4c8d893 100644 (file)
@@ -29,7 +29,7 @@
 module storage {
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         Callback
     ] SQLStatementErrorCallback {
         [Custom] boolean handleEvent(in SQLTransaction transaction, in SQLError error);
index 673d50d..7f506bb 100644 (file)
@@ -30,7 +30,7 @@
 #include "config.h"
 #include "SQLStatementSync.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "DatabaseSync.h"
 #include "SQLException.h"
@@ -123,4 +123,4 @@ PassRefPtr<SQLResultSet> SQLStatementSync::execute(DatabaseSync* db, ExceptionCo
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index d807e55..1d1d727 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef SQLStatementSync_h
 #define SQLStatementSync_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "ExceptionCode.h"
 #include "PlatformString.h"
@@ -58,6 +58,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif // SQLStatementSync_h
index f7053b5..3821287 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "SQLTransaction.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "Database.h"
 #include "DatabaseAuthorizer.h"
@@ -610,4 +610,4 @@ void SQLTransaction::cleanupAfterTransactionErrorCallback()
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 3b6babd..55b588d 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef SQLTransaction_h
 #define SQLTransaction_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "ExceptionCode.h"
 #include "SQLStatement.h"
index 672124c..52fe6a0 100644 (file)
@@ -30,7 +30,7 @@ module storage {
 
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] SQLTransaction {
index 6904880..208ce11 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SQLTransactionCallback_h
 #define SQLTransactionCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/ThreadSafeRefCounted.h>
 
index d2ff93a..066fde8 100644 (file)
@@ -29,7 +29,7 @@
 module storage {
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         Callback
     ] SQLTransactionCallback {
         boolean handleEvent(in SQLTransaction transaction);
index 6b95606..5dba32e 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "SQLTransactionClient.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "AbstractDatabase.h"
 #include "DatabaseTracker.h"
@@ -62,4 +62,4 @@ bool SQLTransactionClient::didExceedQuota(AbstractDatabase* database)
 
 }
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 3c5ec2d..28559ed 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef SQLTransactionClient_h
 #define SQLTransactionClient_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/FastAllocBase.h>
 #include <wtf/Noncopyable.h>
@@ -53,6 +53,6 @@ public:
 
 }
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif // SQLTransactionClient_h
index 104ea10..4158c98 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "SQLTransactionCoordinator.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "Database.h"
 #include "SQLTransaction.h"
@@ -127,4 +127,4 @@ void SQLTransactionCoordinator::shutdown()
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index fd76782..d586de4 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef SQLTransactionCoordinator_h
 #define SQLTransactionCoordinator_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
@@ -65,6 +65,6 @@ namespace WebCore {
     };
 }
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif // SQLTransactionCoordinator_h
index f067571..56727cc 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SQLTransactionErrorCallback_h
 #define SQLTransactionErrorCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/ThreadSafeRefCounted.h>
 
index 6cca1c9..1d20823 100644 (file)
@@ -29,7 +29,7 @@
 module storage {
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         Callback
     ] SQLTransactionErrorCallback {
         boolean handleEvent(in SQLError error);
index 891c71c..8f4c4cf 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "SQLTransactionSync.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "DatabaseAuthorizer.h"
 #include "DatabaseSync.h"
@@ -220,4 +220,4 @@ void SQLTransactionSync::rollback()
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 329a2fe..a006d6a 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef SQLTransactionSync_h
 #define SQLTransactionSync_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "ExceptionCode.h"
 #include "PlatformString.h"
index 8757dd2..c2033f6 100644 (file)
@@ -32,7 +32,7 @@ module storage {
 
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] SQLTransactionSync {
index f22e62f..0c5f8fd 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef SQLTransactionSyncCallback_h
 #define SQLTransactionSyncCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/RefCounted.h>
 
index 93614a8..1867135 100644 (file)
@@ -31,7 +31,7 @@
 module storage {
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         Callback
     ] SQLTransactionSyncCallback {
         boolean handleEvent(in SQLTransactionSync transaction);
index deb8036..3394059 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef DatabaseObserver_h
 #define DatabaseObserver_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/Forward.h>
 
@@ -52,6 +52,6 @@ public:
 
 }
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif // DatabaseObserver_h
index 89b0e7a..ce8701a 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "DatabaseTracker.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "AbstractDatabase.h"
 #include "DatabaseObserver.h"
@@ -218,4 +218,4 @@ void DatabaseTracker::interruptAllDatabasesForContext(const ScriptExecutionConte
 
 }
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 0448478..a92bc5f 100644 (file)
@@ -32,7 +32,7 @@
 #include "QuotaTracker.h"
 #include "PlatformSupport.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/StdLibExtras.h>
 
@@ -89,4 +89,4 @@ void QuotaTracker::resetSpaceAvailableToOrigin(const String& originIdentifier)
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index fcf49e5..def731e 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef QuotaTracker_h
 #define QuotaTracker_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "PlatformString.h"
 #include "SecurityOrigin.h"
@@ -64,6 +64,6 @@ private:
 
 }
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif // QuotaTracker_h
index f2e5455..d12f471 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "SQLTransactionClient.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "AbstractDatabase.h"
 #include "DatabaseObserver.h"
@@ -86,4 +86,4 @@ bool SQLTransactionClient::didExceedQuota(AbstractDatabase* database)
 
 }
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index 39259c8..5cf25e4 100644 (file)
@@ -299,7 +299,7 @@ NotificationCenter* WorkerContext::webkitNotifications() const
 }
 #endif
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 PassRefPtr<Database> WorkerContext::openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
 {
     if (!securityOrigin()->canAccessDatabase() || !AbstractDatabase::isAvailable()) {
index debc6ad..ff7b6d7 100644 (file)
@@ -113,7 +113,7 @@ namespace WebCore {
         NotificationCenter* webkitNotifications() const;
 #endif
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         // HTML 5 client-side database
         PassRefPtr<Database> openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
         PassRefPtr<DatabaseSync> openDatabaseSync(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
index 1277d65..e6f8a8d 100644 (file)
@@ -49,7 +49,7 @@ module threads {
         // WorkerUtils
         [Custom] void importScripts(/*[Variadic] in DOMString urls */);
                  attribute [Replaceable] WorkerNavigator navigator;
-#if defined(ENABLE_DATABASE) && ENABLE_DATABASE
+#if defined(ENABLE_SQL_DATABASE) && ENABLE_SQL_DATABASE
         [EnabledAtRuntime] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
             raises(DOMException);
         [EnabledAtRuntime] DatabaseSync openDatabaseSync(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in [Callback, Optional] DatabaseCallback creationCallback)
index 5de03da..709ad60 100644 (file)
@@ -40,7 +40,7 @@
 #include <utility>
 #include <wtf/Noncopyable.h>
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 #include "DatabaseTask.h"
 #include "DatabaseTracker.h"
 #endif
@@ -197,7 +197,7 @@ public:
         ASSERT(context->isWorkerContext());
         WorkerContext* workerContext = static_cast<WorkerContext*>(context);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         DatabaseTaskSynchronizer cleanupSync;
         workerContext->stopDatabases(&cleanupSync);
 #endif
@@ -210,7 +210,7 @@ public:
         // which become dangling once Heap is destroyed.
         workerContext->removeAllEventListeners();
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         // We wait for the database thread to clean up all its stuff so that we
         // can do more stringent leak checks as we exit.
         cleanupSync.waitForTaskCompletion();
@@ -233,7 +233,7 @@ void WorkerThread::stop()
     if (m_workerContext) {
         m_workerContext->script()->scheduleExecutionTermination();
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         DatabaseTracker::tracker().interruptAllDatabasesForContext(m_workerContext.get());
 #endif
 
index 4dea957..843f430 100644 (file)
@@ -1,3 +1,20 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        * src/DatabaseObserver.cpp:
+        * src/WebDatabase.cpp:
+        (WebKit::WebDatabase::updateDatabaseSize):
+        (WebKit::WebDatabase::updateSpaceAvailable):
+        (WebKit::WebDatabase::resetSpaceAvailable):
+        (WebKit::WebDatabase::closeDatabaseImmediately):
+        * src/WebRuntimeFeatures.cpp:
+        (WebKit::WebRuntimeFeatures::enableDatabase):
+        (WebKit::WebRuntimeFeatures::isDatabaseEnabled):
+
 2011-09-15  Adrienne Walker  <enne@google.com>
 
         [chromium] Add temporary diagnostics for LayerTreeHost::commitTo crash
index 26f5d12..cc8f22d 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "DatabaseObserver.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "AbstractDatabase.h"
 #include "CrossThreadCopier.h"
@@ -195,4 +195,4 @@ void DatabaseObserver::databaseClosed(AbstractDatabase* database)
 
 } // namespace WebCore
 
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
index f97dbe6..20ebe38 100644 (file)
@@ -40,7 +40,7 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 
-#if !ENABLE(DATABASE)
+#if !ENABLE(SQL_DATABASE)
 namespace WebCore {
 class AbstractDatabase {
 public:
@@ -50,7 +50,7 @@ public:
     SecurityOrigin* securityOrigin() const { return 0; }
 };
 }
-#endif // !ENABLE(DATABASE)
+#endif // !ENABLE(SQL_DATABASE)
 
 using namespace WebCore;
 
@@ -94,28 +94,28 @@ WebDatabaseObserver* WebDatabase::observer()
 
 void WebDatabase::updateDatabaseSize(const WebString& originIdentifier, const WebString& name, long long size)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     QuotaTracker::instance().updateDatabaseSize(originIdentifier, name, size);
 #endif
 }
 
 void WebDatabase::updateSpaceAvailable(const WebString& originIdentifier, long long spaceAvailable)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     QuotaTracker::instance().updateSpaceAvailableToOrigin(originIdentifier, spaceAvailable);
 #endif
 }
 
 void WebDatabase::resetSpaceAvailable(const WebString& originIdentifier)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     QuotaTracker::instance().resetSpaceAvailableToOrigin(originIdentifier);
 #endif
 }
 
 void WebDatabase::closeDatabaseImmediately(const WebString& originIdentifier, const WebString& databaseName)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     HashSet<RefPtr<AbstractDatabase> > databaseHandles;
     DatabaseTracker::tracker().getOpenDatabases(originIdentifier, databaseName, &databaseHandles);
     for (HashSet<RefPtr<AbstractDatabase> >::iterator it = databaseHandles.begin(); it != databaseHandles.end(); ++it)
index 3ac8d6d..56e748f 100644 (file)
@@ -44,14 +44,14 @@ namespace WebKit {
 
 void WebRuntimeFeatures::enableDatabase(bool enable)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     AbstractDatabase::setIsAvailable(enable);
 #endif
 }
 
 bool WebRuntimeFeatures::isDatabaseEnabled()
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     return AbstractDatabase::isAvailable();
 #else
     return false;
index 9e40bb8..547a169 100755 (executable)
@@ -1,3 +1,17 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        * WebCoreSupport/ChromeClientEfl.cpp:
+        * WebCoreSupport/ChromeClientEfl.h:
+        * ewk/ewk_settings.cpp:
+        (ewk_settings_web_database_default_quota_get):
+        (ewk_settings_web_database_path_set):
+        (ewk_settings_web_database_path_get):
+
 2011-09-14  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
 
         [EFL] Add NULL checks to ewk_window_features_new_from_core and ewk_view_window_create.
index f82b183..a30a8b1 100644 (file)
@@ -34,7 +34,8 @@
 #include "config.h"
 #include "ChromeClientEfl.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
 #include "DatabaseDetails.h"
 #include "DatabaseTracker.h"
 #endif
@@ -393,7 +394,7 @@ void ChromeClientEfl::needTouchEvents(bool needed)
 }
 #endif
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 void ChromeClientEfl::exceededDatabaseQuota(Frame* frame, const String& databaseName)
 {
     uint64_t quota;
index 6d05119..c92c367 100644 (file)
@@ -106,7 +106,7 @@ public:
 
     virtual void print(Frame*);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     virtual void exceededDatabaseQuota(Frame*, const String&);
 #endif
 
index c190af7..815cfd2 100644 (file)
@@ -22,7 +22,7 @@
 #include "ewk_settings.h"
 
 #include "EWebKit.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 #include "DatabaseTracker.h"
 #endif
 #include "FrameView.h"
@@ -51,7 +51,7 @@ static const char* _ewk_cache_directory_path = 0;
 #endif
 
 static const char* _ewk_icon_database_path = 0;
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 static const char* _ewk_default_web_database_path = 0;
 static uint64_t _ewk_default_web_database_quota = 1 * 1024 * 1024;
 #endif
@@ -82,7 +82,7 @@ static WTF::String _ewk_settings_webkit_os_version_get()
 
 uint64_t ewk_settings_web_database_default_quota_get(void)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     return _ewk_default_web_database_quota;
 #else
     return 0;
@@ -91,7 +91,7 @@ uint64_t ewk_settings_web_database_default_quota_get(void)
 
 void ewk_settings_web_database_path_set(const char *path)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WTF::String corePath = WTF::String::fromUTF8(path);
     WebCore::DatabaseTracker::tracker().setDatabaseDirectoryPath(corePath);
     if (!_ewk_default_web_database_path)
@@ -104,7 +104,7 @@ void ewk_settings_web_database_path_set(const char *path)
 
 const char *ewk_settings_web_database_path_get(void)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     return _ewk_default_web_database_path;
 #else
     return 0;
index a3c82f3..cf13e59 100644 (file)
@@ -1,3 +1,30 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        * WebCoreSupport/ChromeClientGtk.h:
+        * webkit/webkitsecurityorigin.cpp:
+        (webkit_security_origin_get_web_database_usage):
+        (webkit_security_origin_get_web_database_quota):
+        (webkit_security_origin_set_web_database_quota):
+        (webkit_security_origin_get_all_web_databases):
+        * webkit/webkitwebdatabase.cpp:
+        (webkit_web_database_get_display_name):
+        (webkit_web_database_get_expected_size):
+        (webkit_web_database_get_size):
+        (webkit_web_database_get_filename):
+        (webkit_web_database_remove):
+        (webkit_remove_all_web_databases):
+        (webkit_get_web_database_directory_path):
+        (webkit_set_web_database_directory_path):
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_update_settings):
+        (webkit_web_view_settings_notify):
+
 2011-09-10  Adam Barth  <abarth@webkit.org>
 
         Fix build break.
index 86480ea..c1c0427 100644 (file)
@@ -63,7 +63,7 @@
 #include <gtk/gtk.h>
 #include <wtf/text/CString.h>
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 #include "DatabaseTracker.h"
 #endif
 
@@ -576,7 +576,7 @@ void ChromeClient::print(Frame* frame)
     webkit_web_frame_print(webFrame);
 }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 void ChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseName)
 {
     guint64 defaultQuota = webkit_get_default_web_database_quota();
index 698cdeb..d0d40fc 100644 (file)
@@ -115,7 +115,7 @@ namespace WebKit {
         virtual void dispatchViewportDataDidChange(const WebCore::ViewportArguments& arguments) const;
 
         virtual void print(WebCore::Frame*);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String&);
 #endif
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
index e4bcae8..e4a4f64 100644 (file)
@@ -296,7 +296,7 @@ guint64 webkit_security_origin_get_web_database_usage(WebKitSecurityOrigin* secu
 {
     g_return_val_if_fail(WEBKIT_IS_SECURITY_ORIGIN(securityOrigin), 0);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WebCore::SecurityOrigin* coreOrigin = core(securityOrigin);
     return WebCore::DatabaseTracker::tracker().usageForOrigin(coreOrigin);
 #else
@@ -319,7 +319,7 @@ guint64 webkit_security_origin_get_web_database_quota(WebKitSecurityOrigin* secu
 {
     g_return_val_if_fail(WEBKIT_IS_SECURITY_ORIGIN(securityOrigin), 0);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WebCore::SecurityOrigin* coreOrigin = core(securityOrigin);
     return WebCore::DatabaseTracker::tracker().quotaForOrigin(coreOrigin);
 #else
@@ -340,7 +340,7 @@ void webkit_security_origin_set_web_database_quota(WebKitSecurityOrigin* securit
 {
     g_return_if_fail(WEBKIT_IS_SECURITY_ORIGIN(securityOrigin));
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WebCore::SecurityOrigin* coreOrigin = core(securityOrigin);
     WebCore::DatabaseTracker::tracker().setQuota(coreOrigin, quota);
 #endif
@@ -362,7 +362,7 @@ GList* webkit_security_origin_get_all_web_databases(WebKitSecurityOrigin* securi
     g_return_val_if_fail(WEBKIT_IS_SECURITY_ORIGIN(securityOrigin), NULL);
     GList* databases = NULL;
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WebCore::SecurityOrigin* coreOrigin = core(securityOrigin);
     Vector<WTF::String> databaseNames;
 
index 40cd755..b9572fd 100644 (file)
@@ -325,7 +325,7 @@ const gchar* webkit_web_database_get_display_name(WebKitWebDatabase* webDatabase
 {
     g_return_val_if_fail(WEBKIT_IS_WEB_DATABASE(webDatabase), NULL);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WebKitWebDatabasePrivate* priv = webDatabase->priv;
     WebCore::DatabaseDetails details = WebCore::DatabaseTracker::tracker().detailsForNameAndOrigin(priv->name, core(priv->origin));
     WTF::String displayName =  details.displayName();
@@ -357,7 +357,7 @@ guint64 webkit_web_database_get_expected_size(WebKitWebDatabase* webDatabase)
 {
     g_return_val_if_fail(WEBKIT_IS_WEB_DATABASE(webDatabase), 0);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WebKitWebDatabasePrivate* priv = webDatabase->priv;
     WebCore::DatabaseDetails details = WebCore::DatabaseTracker::tracker().detailsForNameAndOrigin(priv->name, core(priv->origin));
     return details.expectedUsage();
@@ -380,7 +380,7 @@ guint64 webkit_web_database_get_size(WebKitWebDatabase* webDatabase)
 {
     g_return_val_if_fail(WEBKIT_IS_WEB_DATABASE(webDatabase), 0);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WebKitWebDatabasePrivate* priv = webDatabase->priv;
     WebCore::DatabaseDetails details = WebCore::DatabaseTracker::tracker().detailsForNameAndOrigin(priv->name, core(priv->origin));
     return details.currentUsage();
@@ -403,7 +403,7 @@ const gchar* webkit_web_database_get_filename(WebKitWebDatabase* webDatabase)
 {
     g_return_val_if_fail(WEBKIT_IS_WEB_DATABASE(webDatabase), NULL);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WebKitWebDatabasePrivate* priv = webDatabase->priv;
     WTF::String coreName = WTF::String::fromUTF8(priv->name);
     WTF::String corePath = WebCore::DatabaseTracker::tracker().fullPathForDatabase(core(priv->origin), coreName);
@@ -433,7 +433,7 @@ void webkit_web_database_remove(WebKitWebDatabase* webDatabase)
 {
     g_return_if_fail(WEBKIT_IS_WEB_DATABASE(webDatabase));
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WebKitWebDatabasePrivate* priv = webDatabase->priv;
     WebCore::DatabaseTracker::tracker().deleteDatabase(core(priv->origin), priv->name);
 #endif
@@ -448,7 +448,7 @@ void webkit_web_database_remove(WebKitWebDatabase* webDatabase)
  **/
 void webkit_remove_all_web_databases()
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WebCore::DatabaseTracker::tracker().deleteAllDatabases();
 #endif
 }
@@ -466,7 +466,7 @@ void webkit_remove_all_web_databases()
  **/
 const gchar* webkit_get_web_database_directory_path()
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WTF::String path = WebCore::DatabaseTracker::tracker().databaseDirectoryPath();
 
     if (path.isEmpty())
@@ -491,7 +491,7 @@ const gchar* webkit_get_web_database_directory_path()
  **/
 void webkit_set_web_database_directory_path(const gchar* path)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WTF::String corePath = WTF::String::fromUTF8(path);
     WebCore::DatabaseTracker::tracker().setDatabaseDirectoryPath(corePath);
 
index e2edd84..742c421 100644 (file)
@@ -3233,7 +3233,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
     coreSettings->setHyperlinkAuditingEnabled(settingsPrivate->enableHyperlinkAuditing);
     coreSettings->setDNSPrefetchingEnabled(settingsPrivate->enableDNSPrefetching);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     AbstractDatabase::setIsAvailable(settingsPrivate->enableHTML5Database);
 #endif
 
@@ -3318,7 +3318,7 @@ static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GPar
         settings->setPrivateBrowsingEnabled(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-caret-browsing"))
         settings->setCaretBrowsingEnabled(g_value_get_boolean(&value));
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     else if (name == g_intern_string("enable-html5-database")) {
         AbstractDatabase::setIsAvailable(g_value_get_boolean(&value));
     }
index 3e269c6..3a12a81 100644 (file)
@@ -1,3 +1,12 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        * WebCoreSupport/ChromeClientHaiku.h:
+
 2011-08-30  Kaustubh Atrawalkar  <kaustubh@motorola.com>
 
         The unused ScrollView* argument can and should be removed from
index 6398c9d..2f77987 100644 (file)
@@ -127,7 +127,7 @@ namespace WebCore {
 
         void print(Frame*);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         virtual void exceededDatabaseQuota(Frame*, const String& databaseName);
 #endif
 
index 07e9cfe..8a4accc 100644 (file)
@@ -1,3 +1,31 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        * Storage/WebDatabaseManager.mm:
+        * Storage/WebDatabaseManagerInternal.h:
+        * Storage/WebDatabaseManagerPrivate.h:
+        * Storage/WebDatabaseQuotaManager.mm:
+        (-[WebDatabaseQuotaManager usage]):
+        (-[WebDatabaseQuotaManager quota]):
+        (-[WebDatabaseQuotaManager setQuota:]):
+        * Storage/WebDatabaseTrackerClient.h:
+        * Storage/WebDatabaseTrackerClient.mm:
+        * WebCoreSupport/WebChromeClient.h:
+        * WebCoreSupport/WebChromeClient.mm:
+        * WebCoreSupport/WebSecurityOrigin.mm:
+        (-[WebSecurityOrigin usage]):
+        (-[WebSecurityOrigin quota]):
+        (-[WebSecurityOrigin setQuota:]):
+        * WebView/WebFrame.mm:
+        (-[WebFrame _cacheabilityDictionary]):
+        * WebView/WebView.mm:
+        (-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
+        (-[WebView _preferencesChanged:]):
+
 2011-09-15  Mark Hahnenberg  <mhahnenberg@apple.com>
 
         Unzip initialization lists and constructors in JSCell hierarchy (7/7)
index 8c5e8a2..44c4313 100644 (file)
@@ -29,7 +29,7 @@
 #import "WebDatabaseManagerPrivate.h"
 #import "WebDatabaseManagerInternal.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #import "WebDatabaseTrackerClient.h"
 #import "WebSecurityOriginInternal.h"
index 6a4ad1d..b461345 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 void WebKitInitializeDatabasesIfNecessary();
 
index 94d8109..6ce7e25 100644 (file)
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
 extern NSString *WebDatabaseDirectoryDefaultsKey;
 
 extern NSString *WebDatabaseDisplayNameKey;
index e26ae33..476d583 100644 (file)
@@ -49,7 +49,7 @@ using namespace WebCore;
 
 - (unsigned long long)usage
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     return DatabaseTracker::tracker().usageForOrigin([_origin _core]);
 #else
     return 0;
@@ -58,7 +58,7 @@ using namespace WebCore;
 
 - (unsigned long long)quota
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     return DatabaseTracker::tracker().quotaForOrigin([_origin _core]);
 #else
     return 0;
@@ -70,7 +70,7 @@ using namespace WebCore;
 // prevent new data from being added to databases in that origin.
 - (void)setQuota:(unsigned long long)quota
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     DatabaseTracker::tracker().setQuota([_origin _core], quota);
 #endif
 }
index cbb5eb7..ae7efa2 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if ENABLE(DATABASE) 
+#if ENABLE(SQL_DATABASE) 
 
 #import <WebCore/DatabaseTrackerClient.h>
 
index 65aba43..85031c1 100644 (file)
@@ -28,7 +28,7 @@
  
 #import "WebDatabaseTrackerClient.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #import "WebDatabaseManagerPrivate.h"
 #import "WebSecurityOriginInternal.h"
index bd2d3ca..4df10d0 100644 (file)
@@ -109,7 +109,7 @@ public:
     virtual void setToolTip(const WTF::String&, WebCore::TextDirection);
 
     virtual void print(WebCore::Frame*);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName);
 #endif
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
index cf5cdce..403605b 100644 (file)
@@ -657,7 +657,7 @@ void WebChromeClient::print(Frame* frame)
         CallUIDelegate(m_webView, @selector(webView:printFrameView:), [webFrame frameView]);
 }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseName)
 {
index 131a1ac..2373f84 100644 (file)
@@ -162,7 +162,7 @@ using namespace WebCore;
 
 - (unsigned long long)usage
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     return DatabaseTracker::tracker().usageForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
 #else
     return 0;
@@ -171,7 +171,7 @@ using namespace WebCore;
 
 - (unsigned long long)quota
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     return DatabaseTracker::tracker().quotaForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
 #else
     return 0;
@@ -180,7 +180,7 @@ using namespace WebCore;
 
 - (void)setQuota:(unsigned long long)quota
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     DatabaseTracker::tracker().setQuota(reinterpret_cast<SecurityOrigin*>(_private), quota);
 #endif
 }
index bd4460a..d6b84ef 100644 (file)
@@ -1177,7 +1177,7 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
     }
     
     if (Document* document = _private->coreFrame->document()) {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         if (document->hasOpenDatabases())
             [result setObject:[NSNumber numberWithBool:YES] forKey:WebFrameUsesDatabases];
 #endif
index efd3db1..e1fd8a7 100644 (file)
@@ -726,7 +726,7 @@ static NSString *leakSolarWalkQuirksUserScriptContents()
         WebKitInitializeLoggingChannelsIfNecessary();
         WebCore::InitializeLoggingChannelsIfNecessary();
         [WebHistoryItem initWindowWatcherIfNecessary];
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         WebKitInitializeDatabasesIfNecessary();
 #endif
 
@@ -1515,7 +1515,7 @@ static bool needsSelfRetainWhileLoadingQuirk()
     settings->setMinimumLogicalFontSize([preferences minimumLogicalFontSize]);
     settings->setPictographFontFamily([preferences pictographFontFamily]);
     settings->setPluginsEnabled([preferences arePlugInsEnabled]);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     AbstractDatabase::setIsAvailable([preferences databasesEnabled]);
 #endif
     settings->setLocalStorageEnabled([preferences localStorageEnabled]);
index ba039c7..b267720 100644 (file)
@@ -86,7 +86,7 @@ QString QWebDatabase::name() const
 */
 QString QWebDatabase::displayName() const
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     DatabaseDetails details = DatabaseTracker::tracker().detailsForNameAndOrigin(d->name, d->origin.get());
     return details.displayName();
 #else
@@ -99,7 +99,7 @@ QString QWebDatabase::displayName() const
 */
 qint64 QWebDatabase::expectedSize() const
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     DatabaseDetails details = DatabaseTracker::tracker().detailsForNameAndOrigin(d->name, d->origin.get());
     return details.expectedUsage();
 #else
@@ -112,7 +112,7 @@ qint64 QWebDatabase::expectedSize() const
 */
 qint64 QWebDatabase::size() const
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     DatabaseDetails details = DatabaseTracker::tracker().detailsForNameAndOrigin(d->name, d->origin.get());
     return details.currentUsage();
 #else
@@ -147,7 +147,7 @@ QWebDatabase::QWebDatabase(QWebDatabasePrivate* priv)
 */
 QString QWebDatabase::fileName() const
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     return DatabaseTracker::tracker().fullPathForDatabase(d->origin.get(), d->name, false);
 #else
     return QString();
@@ -170,7 +170,7 @@ QWebSecurityOrigin QWebDatabase::origin() const
 */
 void QWebDatabase::removeDatabase(const QWebDatabase& db)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     DatabaseTracker::tracker().deleteDatabase(db.d->origin.get(), db.d->name);
 #endif
 }
@@ -184,7 +184,7 @@ void QWebDatabase::removeDatabase(const QWebDatabase& db)
 */
 void QWebDatabase::removeAllDatabases()
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     DatabaseTracker::tracker().deleteAllDatabases();
 #endif
 }
index 97f887a..ccd9c54 100644 (file)
@@ -120,7 +120,7 @@ int QWebSecurityOrigin::port() const
 */
 qint64 QWebSecurityOrigin::databaseUsage() const
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     return DatabaseTracker::tracker().usageForOrigin(d->origin.get());
 #else
     return 0;
@@ -132,7 +132,7 @@ qint64 QWebSecurityOrigin::databaseUsage() const
 */
 qint64 QWebSecurityOrigin::databaseQuota() const
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     return DatabaseTracker::tracker().quotaForOrigin(d->origin.get());
 #else
     return 0;
@@ -148,7 +148,7 @@ qint64 QWebSecurityOrigin::databaseQuota() const
 */
 void QWebSecurityOrigin::setDatabaseQuota(qint64 quota)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     DatabaseTracker::tracker().setQuota(d->origin.get(), quota);
 #endif
 }
@@ -181,7 +181,7 @@ QList<QWebSecurityOrigin> QWebSecurityOrigin::allOrigins()
 {
     QList<QWebSecurityOrigin> webOrigins;
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     Vector<RefPtr<SecurityOrigin> > coreOrigins;
     DatabaseTracker::tracker().origins(coreOrigins);
 
@@ -201,7 +201,7 @@ QList<QWebDatabase> QWebSecurityOrigin::databases() const
 {
     QList<QWebDatabase> databases;
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     Vector<String> nameVector;
 
     if (!DatabaseTracker::tracker().databaseNamesForOrigin(d->origin.get(), nameVector))
index 3676f03..24cc432 100644 (file)
@@ -247,7 +247,7 @@ void QWebSettingsPrivate::apply()
                                       global->attributes.value(QWebSettings::PrintElementBackgrounds));
         settings->setShouldPrintBackgrounds(value);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         value = attributes.value(QWebSettings::OfflineStorageDatabaseEnabled,
                                       global->attributes.value(QWebSettings::OfflineStorageDatabaseEnabled));
         WebCore::AbstractDatabase::setIsAvailable(value);
@@ -978,7 +978,7 @@ void QWebSettings::resetAttribute(WebAttribute attr)
 */
 void QWebSettings::setOfflineStoragePath(const QString& path)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WebCore::DatabaseTracker::tracker().setDatabaseDirectoryPath(path);
 #endif
 }
@@ -993,7 +993,7 @@ void QWebSettings::setOfflineStoragePath(const QString& path)
 */
 QString QWebSettings::offlineStoragePath()
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     return WebCore::DatabaseTracker::tracker().databaseDirectoryPath();
 #else
     return QString();
index e619dca..4cf182a 100644 (file)
@@ -1,3 +1,30 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        * Api/qwebdatabase.cpp:
+        (QWebDatabase::displayName):
+        (QWebDatabase::expectedSize):
+        (QWebDatabase::size):
+        (QWebDatabase::fileName):
+        (QWebDatabase::removeDatabase):
+        (QWebDatabase::removeAllDatabases):
+        * Api/qwebsecurityorigin.cpp:
+        (QWebSecurityOrigin::databaseUsage):
+        (QWebSecurityOrigin::databaseQuota):
+        (QWebSecurityOrigin::setDatabaseQuota):
+        (QWebSecurityOrigin::allOrigins):
+        (QWebSecurityOrigin::databases):
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        (QWebSettings::setOfflineStoragePath):
+        (QWebSettings::offlineStoragePath):
+        * WebCoreSupport/ChromeClientQt.cpp:
+        * WebCoreSupport/ChromeClientQt.h:
+
 2011-09-13  Zeno Albisser  <zeno.albisser@nokia.com>
 
         [Qt] Fix state of stop/reload actions in QWebPage
index 09a9377..69a6a84 100644 (file)
@@ -529,7 +529,7 @@ void ChromeClientQt::print(Frame* frame)
     emit m_webPage->printRequested(QWebFramePrivate::kit(frame));
 }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 void ChromeClientQt::exceededDatabaseQuota(Frame* frame, const String& databaseName)
 {
     quint64 quota = QWebSettings::offlineStorageDefaultQuota();
index 66a5912..b06fc2b 100644 (file)
@@ -133,7 +133,7 @@ public:
     virtual void setToolTip(const String&, TextDirection);
 
     virtual void print(Frame*);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     virtual void exceededDatabaseQuota(Frame*, const String&);
 #endif
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
index 2db1022..c16790f 100644 (file)
@@ -1,3 +1,23 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        * ForEachCoClass.h:
+        * WebCoreSupport/WebChromeClient.cpp:
+        * WebCoreSupport/WebChromeClient.h:
+        * WebDatabaseManager.cpp:
+        * WebDatabaseManager.h:
+        * WebSecurityOrigin.cpp:
+        (WebSecurityOrigin::usage):
+        (WebSecurityOrigin::quota):
+        (WebSecurityOrigin::setQuota):
+        * WebView.cpp:
+        (WebView::initWithFrame):
+        (WebView::notifyPreferencesChanged):
+
 2011-09-15  Kentaro Hara  <haraken@google.com>
 
         A single line must not be split into two pages.
index 02aa097..4bd3ebf 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "ProgIDMacros.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 #define WEB_DATABASE_MANAGER(macro) macro(WebDatabaseManager)
 #else
 #define WEB_DATABASE_MANAGER(macro)
index 517a4f0..17c90fa 100644 (file)
@@ -577,7 +577,7 @@ void WebChromeClient::print(Frame* frame)
         uiDelegate->printFrame(m_webView, kit(frame));
 }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseIdentifier)
 {
     COMPtr<WebSecurityOrigin> origin(AdoptCOM, WebSecurityOrigin::createInstance(frame->document()->securityOrigin()));
index 97e7ba1..2e84d1e 100644 (file)
@@ -113,7 +113,7 @@ public:
 
     virtual void print(WebCore::Frame*);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String&);
 #endif
 
index e2b81e1..090ce55 100644 (file)
@@ -30,7 +30,7 @@
 #include "WebDatabaseManager.h"
 #include "WebKitDLL.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "CFDictionaryPropertyBag.h"
 #include "COMEnumVariant.h"
index b52cbd5..3c5dd1e 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef WebDatabaseManager_h
 #define WebDatabaseManager_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "WebKit.h"
 #include <WebCore/DatabaseTrackerClient.h>
index baec72e..61fcadf 100644 (file)
@@ -33,7 +33,7 @@
 #include <WebCore/BString.h>
 #include <WebCore/DatabaseTracker.h>
 
-#if !ENABLE(DATABASE)
+#if !ENABLE(SQL_DATABASE)
 #include <wtf/UnusedParam.h>
 #endif
 
@@ -130,7 +130,7 @@ HRESULT STDMETHODCALLTYPE WebSecurityOrigin::port(
 HRESULT STDMETHODCALLTYPE WebSecurityOrigin::usage( 
     /* [retval][out] */ unsigned long long* result)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     if (!result)
         return E_POINTER;
 
@@ -146,7 +146,7 @@ HRESULT STDMETHODCALLTYPE WebSecurityOrigin::usage(
 HRESULT STDMETHODCALLTYPE WebSecurityOrigin::quota( 
     /* [retval][out] */ unsigned long long* result)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     if (!result)
         return E_POINTER;
 
@@ -161,7 +161,7 @@ HRESULT STDMETHODCALLTYPE WebSecurityOrigin::quota(
 HRESULT STDMETHODCALLTYPE WebSecurityOrigin::setQuota( 
     /* [in] */ unsigned long long quota) 
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     DatabaseTracker::tracker().setQuota(m_securityOrigin.get(), quota);
 
     return S_OK;
index 2f43619..1ebd45e 100644 (file)
@@ -2619,7 +2619,7 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame(
     static bool didOneTimeInitialization;
     if (!didOneTimeInitialization) {
         InitializeLoggingChannelsIfNecessary();
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
         WebKitInitializeWebDatabasesIfNecessary();
 #endif
         WebKitSetApplicationCachePathIfNecessary();
@@ -4754,7 +4754,7 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
         return hr;
     settings->setOfflineWebApplicationCacheEnabled(enabled);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     hr = prefsPrivate->databasesEnabled(&enabled);
     if (FAILED(hr))
         return hr;
index 5028082..c094a3b 100644 (file)
@@ -1,3 +1,13 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        * WebCoreSupport/ChromeClientWinCE.cpp:
+        * WebCoreSupport/ChromeClientWinCE.h:
+
 2011-08-30  Ryosuke Niwa  <rniwa@webkit.org>
 
         WinCE build fix attempt after r94080.
index 361aee5..4c40883 100644 (file)
@@ -298,7 +298,7 @@ void ChromeClientWinCE::print(Frame*)
     notImplemented();
 }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 void ChromeClientWinCE::exceededDatabaseQuota(Frame*, const String&)
 {
     notImplemented();
index 5c98d8f..9033a7d 100644 (file)
@@ -113,7 +113,7 @@ public:
 
     virtual void print(WebCore::Frame*);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName);
 #endif
 
index 15c9092..0602e00 100644 (file)
@@ -1,3 +1,19 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        * WebKitSupport/ChromeClientWx.cpp:
+        * WebKitSupport/ChromeClientWx.h:
+        * WebView.cpp:
+        (wxWebView::Create):
+        (wxWebView::SetDatabaseDirectory):
+        (wxWebView::GetDatabaseDirectory):
+        (wxWebView::SetDatabasesEnabled):
+        (wxWebView::AreDatabasesEnabled):
+
 2011-09-04  Robin Dunn  <robin@alldunn.com>
 
         [wx] Enable wxWebKit to run using the wxGC Cairo backend on platforms other than GTK.
index 9750c55..857ef9e 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "ChromeClientWx.h"
 #include "Console.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 #include "DatabaseTracker.h"
 #endif
 #include "FileChooser.h"
@@ -420,7 +420,7 @@ void ChromeClientWx::print(Frame* frame)
     }
 }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 void ChromeClientWx::exceededDatabaseQuota(Frame*, const String&)
 {
     unsigned long long quota = 5 * 1024 * 1024;
index dd8a964..39bdf86 100644 (file)
@@ -120,7 +120,7 @@ public:
 
     virtual void print(Frame*);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     virtual void exceededDatabaseQuota(Frame*, const String&);
 #endif
 
index 2699ec9..1989681 100644 (file)
@@ -76,7 +76,7 @@
 #include <wtf/MainThread.h>
 #include <wtf/text/CString.h>
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 #include "AbstractDatabase.h"
 #include "DatabaseTracker.h"
 #endif
@@ -415,7 +415,7 @@ bool wxWebView::Create(wxWindow* parent, int id, const wxPoint& position,
     settings->setStandardFontFamily("Times New Roman");
     settings->setJavaScriptEnabled(true);
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     SetDatabasesEnabled(true);
 #endif
 
@@ -1100,7 +1100,7 @@ bool wxWebView::ShouldClose() const
 /* static */
 void wxWebView::SetDatabaseDirectory(const wxString& databaseDirectory)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WebCore::DatabaseTracker::tracker().setDatabaseDirectoryPath(databaseDirectory);
 #endif
 }
@@ -1108,7 +1108,7 @@ void wxWebView::SetDatabaseDirectory(const wxString& databaseDirectory)
 /* static */
 wxString wxWebView::GetDatabaseDirectory()
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     return WebCore::DatabaseTracker::tracker().databaseDirectoryPath();
 #else
     return wxEmptyString;
@@ -1118,7 +1118,7 @@ wxString wxWebView::GetDatabaseDirectory()
 /* static */
 void wxWebView::SetDatabasesEnabled(bool enabled)
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     WebCore::AbstractDatabase::setIsAvailable(enabled);
 #endif
 }
@@ -1126,7 +1126,7 @@ void wxWebView::SetDatabasesEnabled(bool enabled)
 /* static */
 bool wxWebView::AreDatabasesEnabled()
 {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     return WebCore::AbstractDatabase::isAvailable();
 #endif
     return false;
index 10f2648..fb155c0 100644 (file)
@@ -1,3 +1,17 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+
 2011-09-15  Eric Seidel  <eric@webkit.org>
 
         Remove ENABLE(SVG_AS_IMAGE) since all major ports have it on by default
index 80d8922..a0dfa0c 100644 (file)
@@ -517,7 +517,7 @@ void WebChromeClient::print(Frame* frame)
     m_page->sendSync(Messages::WebPageProxy::PrintFrame(webFrame->frameID()), Messages::WebPageProxy::PrintFrame::Reply());
 }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseName)
 {
     WebFrame* webFrame = static_cast<WebFrameLoaderClient*>(frame->loader()->client())->webFrame();
index b2222ac..60a2790 100644 (file)
@@ -132,7 +132,7 @@ private:
     
     virtual void print(WebCore::Frame*);
     
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     virtual void exceededDatabaseQuota(WebCore::Frame*, const String& databaseName);
 #endif
 
index e2d67fc..bac27a9 100644 (file)
@@ -1584,7 +1584,7 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
     settings->setMediaPlaybackRequiresUserGesture(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackRequiresUserGestureKey()));
     settings->setMediaPlaybackAllowsInline(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackAllowsInlineKey()));
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     AbstractDatabase::setIsAvailable(store.getBoolValueForKey(WebPreferencesKey::databasesEnabledKey()));
 #endif
 
index 9104253..5b3eba1 100644 (file)
@@ -191,7 +191,7 @@ void WebProcess::initializeWebProcess(const WebProcessCreationParameters& parame
         }
     }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
     // Make sure the WebDatabaseManager is initialized so that the Database directory is set.
     WebDatabaseManager::initialize(parameters.databaseDirectory);
 #endif
index ecc9992..6e04a89 100644 (file)
@@ -62,7 +62,7 @@ SET(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter"
 WEBKIT_FEATURE(ENABLE_AS_IMAGE "Enable SVG as image" DEFAULT ON SVG)
 WEBKIT_FEATURE(ENABLE_BLOB "Enable blob slice" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_CHANNEL_MESSAGING "Enable channel messaging" DEFAULT ON)
-WEBKIT_FEATURE(ENABLE_DATABASE "Enable database" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_SQL_DATABASE "Enable SQL database" DEFAULT ON)
 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)
index 13ff216..2be14ed 100644 (file)
@@ -23,7 +23,7 @@ ADD_SUBDIRECTORY(${3RDPARTY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/3rdparty")
 WEBKIT_FEATURE(ENABLE_AS_IMAGE "Enable SVG as image" DEFAULT ON SVG)
 WEBKIT_FEATURE(ENABLE_BLOB "Enable blob slice" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_CHANNEL_MESSAGING "Enable channel messaging" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_DATABASE "Enable database" DEFAULT OFF)
+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)
index 810d7d1..4d14b48 100644 (file)
@@ -8,7 +8,7 @@
 #cmakedefine01 ENABLE_AS_IMAGE
 #cmakedefine01 ENABLE_BLOB
 #cmakedefine01 ENABLE_CHANNEL_MESSAGING
-#cmakedefine01 ENABLE_DATABASE
+#cmakedefine01 ENABLE_SQL_DATABASE
 #cmakedefine01 ENABLE_DATAGRID
 #cmakedefine01 ENABLE_DATALIST
 #cmakedefine01 ENABLE_DATA_TRANSFER_ITEMS
index 0543e51..0eaa1bd 100755 (executable)
@@ -74,7 +74,7 @@ my (
     $clientBasedGeolocationSupport,
     $coverageSupport,
     $css3FlexboxSupport,
-    $databaseSupport,
+    $sqlDatabaseSupport,
     $datalistSupport,
     $dataTransferItemsSupport,
     $detailsSupport,
@@ -158,8 +158,8 @@ my @features = (
     { option => "coverage", desc => "Toggle code coverage support",
       define => "", default => 0, value => \$coverageSupport },
 
-    { option => "database", desc => "Toggle Database Support",
-      define => "ENABLE_DATABASE", default => 1, value => \$databaseSupport },
+    { option => "sql-database", desc => "Toggle SQL Database Support",
+      define => "ENABLE_SQL_DATABASE", default => 1, value => \$sqlDatabaseSupport },
 
     { option => "datalist", desc => "Toggle HTML5 datalist support",
       define => "ENABLE_DATALIST", default => 1, value => \$datalistSupport },
index a79ba5d..e4e1a91 100644 (file)
@@ -1,3 +1,13 @@
+2011-09-15  Adam Barth  <abarth@webkit.org>
+
+        Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
+        https://bugs.webkit.org/show_bug.cgi?id=68205
+
+        Reviewed by Eric Seidel.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
 2011-09-15  Eric Seidel  <eric@webkit.org>
 
         Remove ENABLE(SVG_AS_IMAGE) since all major ports have it on by default
index 4e66d5a..0a5f9ae 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_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(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_XHTMLMP);$(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_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_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(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_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_3D_CANVAS"
@@ -52,8 +52,8 @@
                PerformEnvironmentSet="true"
        />
   <UserMacro
-               Name="ENABLE_DATABASE"
-               Value="ENABLE_DATABASE"
+               Name="ENABLE_SQL_DATABASE"
+               Value="ENABLE_SQL_DATABASE"
                PerformEnvironmentSet="true"
        />
   <UserMacro
index 3b3f775..13b1437 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_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(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_XHTMLMP);$(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_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_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(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_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_3D_CANVAS"
@@ -52,8 +52,8 @@
                PerformEnvironmentSet="true"
        />
   <UserMacro
-               Name="ENABLE_DATABASE"
-               Value="ENABLE_DATABASE"
+               Name="ENABLE_SQL_DATABASE"
+               Value="ENABLE_SQL_DATABASE"
                PerformEnvironmentSet="true"
        />
   <UserMacro
index e03ddbd..710d2cf 100644 (file)
@@ -494,13 +494,13 @@ AC_ARG_ENABLE(input_speech,
               [],[enable_input_speech="no"])
 AC_MSG_RESULT([$enable_input_speech])
 
-# check whether to build with database support
-AC_MSG_CHECKING([whether to enable HTML5 client-side database storage support])
-AC_ARG_ENABLE(database,
-              AC_HELP_STRING([--enable-database],
-                             [enable HTML5 client-side database storage support [default=yes]]),
-              [],[enable_database="yes"])
-AC_MSG_RESULT([$enable_database])
+# check whether to build with SQL database support
+AC_MSG_CHECKING([whether to enable SQL client-side database storage support])
+AC_ARG_ENABLE(sql_database,
+              AC_HELP_STRING([--enable-sql-database],
+                             [enable SQL client-side database storage support [default=yes]]),
+              [],[enable_sql_database="yes"])
+AC_MSG_RESULT([$enable_sql_database])
 
 # check whether to build with server-sent events support
 AC_MSG_CHECKING([whether to enable HTML5 server-sent events support])
@@ -1003,7 +1003,7 @@ AC_SUBST([SQLITE3_CFLAGS])
 AC_SUBST([SQLITE3_LIBS])
 
 if (test "$sqlite3_found" = "no") && (test "$enable_icon_database" = "yes" || \
-   test "$enable_database" = "yes" || \
+   test "$enable_sql_database" = "yes" || \
    test "$enable_offline_web_applications" = "yes" || \
    test "$enable_dom_storage" = "yes"); then
    AC_MSG_ERROR([SQLite3 is required for the Database related features])
@@ -1132,7 +1132,7 @@ 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_DATABASE],[test "$enable_database" = "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"])
 AM_CONDITIONAL([ENABLE_EVENTSOURCE],[test "$enable_eventsource" = "yes"])
@@ -1239,7 +1239,7 @@ Features:
  Page Visibility API support                              : $enable_page_visibility_api
  HTML5 progress element support                           : $enable_progress_tag
  HTML5 client-side session and persistent storage support : $enable_dom_storage
HTML5 client-side database storage support               : $enable_database
SQL client-side database storage support                 : $enable_sql_database
  HTML5 datagrid support                                   : $enable_datagrid
  HTML5 data transfer items support                        : $enable_data_transfer_items
  HTML5 FileSystem API support                             : $enable_file_system