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 66e65deee522c992c327b7d45e06637087d11d22..260d37e45d53441f5ec83aafb2cebd3301837c18 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 c337e963761daf4bf8a8693e54c21dbd1e1c21dc..dc7aa9cc8d16cb9cac4333dbedf6529afed1c0ac 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 ec8a04bbe6996aca59747ae194e862847f14e7cc..de788020c4bb8a0c3289dd4298e33e6770399c60 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 0ece7b612584c3cd0dd68ceb89a0c240c5ebe379..84d9f17a265932898dffe3439d4440cd482ede8f 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 c750b1292a7def1caae20a8bbbd2cec7cb8bbd84..ae2fb83fd6366f88e4598ed6b553dd0063844157 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 4c88a5be9e23cb0ce4fa221e4d797e831115c3cf..6a4e0ba83a5af8cf7f7112ab01c2e57b8877d404 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 e6d491980e65a3167f7867c11849c4d86295b7af..87bf3877ab815e9613cc1c46e204959f6db1c665 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 a221fd8d8ce4bf38d4ee9c8c101c6286510be371..a8e6b2ef3c3c91daf0be82f9544140bba812d676 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 2f9e475af4264de3b9e4b32e6a6417fecba0be81..e45b76f1c14c5e88915d71787ec9cf3a429bf1d5 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 cf5d77933a02d330b89954eca798508a354c4f33..77f264050bec653534feff1d96678193669ae05b 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 c269097d90515b14904a6c4da92c957710f9239b..79388a5231745f0659e275845c6af429784ff200 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 7fb7cf25f9ac03898cda0eaa6a8fb592d0949e59..32676a8551f3d51a44a1b5945e58b5e80848a731 100644 (file)
@@ -135,7 +135,7 @@ bool RuntimeEnabledFeatures::webSocketEnabled()
 }
 #endif
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 bool RuntimeEnabledFeatures::openDatabaseEnabled()
 {
     return AbstractDatabase::isAvailable();
index 042f816bbdafdb6d6fd389c2e0a1ee130a4e8e69..7232b014fc5ce2546af91b15b269a2a0ecefa624 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 85765181d16584921b6798c34ac4f7ba772679d4..5525ca3f2461f4a2a084a52ff28a0325b782aa0c 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 4dbabb689ecffa1c72294e2f314ce2d5c6b65c6e..f796b6fcffc434c497a344a31a74cfc7832c2117 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 44b38ec669d2d88193155afdf2a42bd04b16b7de..efcb09284b24416883ab5657ce261c05729ec639 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 2e781b8a900475341d8c4706eeb5670741360c2d..7f9f99e6470129ffce277d19f3f2737aced78243 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 dd9a07bebf32051bcbba1d5ec9cf792f604385ab..4800355653fa8315c3261300e4dd0fc5ee524c6c 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 2ce9015a08a24520abd465cf9d57e7a82610d06c..27e2cf30a6dbafe2aca19b36d7d2456c23671b9e 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 da7a98e4bbd91ceea54fb9d9af3400e2ef60c909..eb56f2891dd057e0eb5bdca4d6323a676ee683f7 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 d12d0c36de11e37344297c9f3d769683bbc6938c..483b2575a19b456b6019c027c76b6811fc52362f 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 8d11a4be2becf327f5466144c468fc05725735ca..1a55a35508f5326bf391ff363cd6af146ba83a85 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 b63f50e946d7f1dc01fb71582d245ab74247140a..84a3620999a40f58f0462ec8a454f9470fe60ba3 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 eea587c8d93ac53670fd775de94db864e5b61d49..fc1461bdd9351991cea7ecc9c598d839508621c5 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 226e8743dee2e66cf77b22f178924cb7ef4be7ab..a6f3cce1e04978f60f54dd8ed516fba1145ab28a 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 e070de58cc384f9aa6f051d83b23e1def5af0080..9b0866c9a4818323c9837deb89a0ba91c24c732d 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 9e1b1bd60b667ee498ef117c822c6dab38e1c30d..8514eee4919345707b0cb7af0c8eaf924f2378f5 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 807ad4f6c41cc06216a671b06e6004e891e86b06..8577a93e8dafa94d7402ead3127292cc72c88aa2 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 e414e3ad8965365c3ff8ecc1bf764b01771a34cb..72980f2ce81b4718d965a1e7026a653833f0dc75 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 99bc5ddd55797da4fa2c5f7055ea975e379f56e4..a39cfaf57ae4bd7a511acf4bbc7a00d826654e5a 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 169f7a5e930ca16069882180fa9455ca5ab0b201..faf66e7d0af778328ec5886539aee5da0ea2db16 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 17fca222d8984ac63e952089a88fa9073edfd4d4..a6d2c8bf26b7928d2c3c21527b1e7ec530522c04 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "V8SQLStatementErrorCallback.h"
 
index 9f98f396b9e8056bc8634f0b5037264ea01a8056..8c54b8181bfe4eef86f7ecc4c181795fadc7f679 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 63d0a973effe10f9720a29d40f4ccc60e439045d..86531abeca7b2dfbcc15b3035ee9caad8e8556a8 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 #include "V8SQLResultSetRowList.h"
 
 #include "SQLResultSetRowList.h"
index af4185b97b708c43e71dcfafea0fa2f1346cfe59..b07c68f4492e2fde323b47e7e4c892a642fd34e2 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "V8SQLTransaction.h"
 
index 8a57a9a1165cc863eb31b3ae97cb49e3377e6ffd..bcec942a5aa6639ef686a9edc38a44616b22b384 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "V8SQLTransactionSync.h"
 
index cba69b9d526eded814bde60d3f16367c6483d6e3..92dac70e22f700dc6f81777e81dd8a6c2fc05f47 100644 (file)
@@ -4564,7 +4564,7 @@ void Document::setSecurityOrigin(SecurityOrigin* securityOrigin)
     initDNSPrefetch();
 }
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 bool Document::allowDatabaseAccess() const
 {
index 5575c5ebd0651f34a0bb0114921141357e530b3d..0ea530508cf7e4c51213194bbe326325bb051486 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 6d3599fcbd68d5bea10328d1b5724bae56d055d7..bb602ac35ebea951a0508af992aa799d2df586ab 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 cea6f675960d9ca3ccba96c8f173d6e500ae3faf..657973156c32721bb2b4cdfdfdcd3a5a83fe9f93 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 a882bef5cefbe2cf93900801b955bdf29f3aea5e..6216d8b62b75ac0be6845c4c2dcf4959b10ca347 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 52d921ce7d046b2583326cef7ef57304fa540e89..8dee69a8d690019d9f9217c6d9bb3928410c7d4b 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 871b1fcc289a6b526f443c92554b3af65709508e..416ded1c300321e3015ec3eaab90dcf7aebc4507 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 4306cea10fa6d265a06d3cbaeec000260e3f61de..166d8c9267c680983c3ef340d245e3345bb70da8 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 b5427f8cd8e8b57ea4cf894c5345e3120e2ed829..e71144615fe8b6734138f1c5863b71e6085dffbb 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 479f2e81e7f87df240a8a40d8978656952f9f3c7..c4917772de926cb8e98ce36ec6889c1f9d6fad1d 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 2589aebb72b3ea9ae9f70c9a9c0b212d5f8638cc..ea31b8c9b30f1d94ac6394d5654f76ed2e280e2a 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 a8fd447672422c3f712775256a0ce2d720f93377..ef35136be86f0247e1011bb305f58e6662c46fd8 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 03d84826a6a8f886c36ec283eba177c44fdad433..fb973366ecb4b0f3ee4af20ec13000849eccaeb8 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 1f6d7f7185cb5a9efd1298f857bb6bd8155b654c..fd6490b32df2a048f7b0e7cd4c6661363d9ee518 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 852370ea0677324c254b91ea76b11fb60dc5bf54..816976592951d4a4ccb99f982721f3568adfad68 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 37bae4015dc96b270b3451c6bde803d61eeccfa2..483973e4e9c15a15e8aec78c2342666ad104ee66 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 5d0c3fc18f32c5c56bb62eac3acb712597002cd5..49ddfc5302f4a2de1a365a7a03940e6e14645b98 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 6f59ee4e26bbbafd80b3bd5607cb92b86be6c3bb..0f693fda852fc2b8ec9c2c4b746a50e56d8cc252 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 bc80905799d0013e5d4421d7173bde2323749651..3c886a95066c38bcd9a46de199c071bacabb4213 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 c349927a383df6cf22913b64bbd542f845ee6abd..9a9a44966e0abb36c9eac362ba76300d1779eaaf 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 0617d4962451d704570d39b732b59824e014f482..fe47ccdbd24bb7c2218938788c77f7da4ce1badc 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 75c535a8f0225a8c20cf2c9db3c8088aff1ce3e0..f5e7c168a9f98b5ba5b97e9b4aa18493317dd72a 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 f5ba51b82de61b64030914e3d8c864c359e30310..724c67679008231c3b0c8fce093d68532f97ba02 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 0ad76613c18430ddb3cc207ce09fae9ffde9a040..34b51a1f983faddadbd73a82807b0994bb4655b5 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 43c2375c61fc39e437107ce1ab85445d1850b7d6..b72494137ff115643873e7ff9639051c94adbc64 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 a2ad809a9f066fc28f5aeebe871ce60dc8a85afd..32321a18b8b924d34b646edb6795adbec56f89ef 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 5fc3d7623338f437a9cc2968938e3162dd661761..fc90782f510d9326dd7c05262b511e3e7bf8482b 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 6fbf79d56aa4a91464be4f8fed321200e4097cef..acaf6092fcc9fb19d066bc21a8c7eab6835b014c 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 67026f9a8d5641d21f264d1571aec00a4fe56b82..4a1b484cdeb8f9b6afa7544d5ddefeeb4884b863 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 362005c6690f400d784b072845f5031678535f2f..002b9690d60f5e066b73dc2f7531254500c1fe5b 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 5c95333671e8bcc8b3e98569f8b023f58fae0605..946f8d754aade22bce8a0a722ddddad44e60095c 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 63b3e7ac5133fc4e679501f77be8c357e29e1bb8..376ce4d2050185bf9cfdaf9e48bd385953a2c59b 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 9ba0739a7c3c93cc91f5034bf5ad60086a82314e..f6073e4264e9968c3b99c4094f9cf73a6e03f819 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 33fd380472684133db33aa383405d43f06cbd007..a98557f7f9d1fd079df2902d1dfb47e5ca961215 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 84195e8de17653988cebe2932f2c9d1010921b0f..eb7d46ca6f5f1da10cbb93502d48d088554349e1 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 128027e1e974916b5511153f7fb87ad6422b93f4..785fe289217a84e46e44a5e048953d8b81c58e0a 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 bf851603ad535ecf0723e249fc9c5d4f8e511134..e4e3cda0505c54e54ae0b39d71ee71a45122f4c0 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 47001a4c0dd9a4ef5de38a1c0b7e77876647945b..bed8fc12474f94407214bc01b38489e9854c3f88 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 78acb7fae302df5a8cc932065661598ff2d9f682..7bf5a3a64efc05d143610fd5d40bd271f2d29433 100644 (file)
@@ -29,7 +29,7 @@
 module storage {
 
     interface [
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] Database {
index b90565c5a28620d8f9b20b27ed1b0b4420b933fc..41592cf3bb17950a8d6503139aad8a9274882c3d 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 586416a8d6c0ccf1a01e5c52cba1ecb79390ffbe..bfa7bc627522fb6c830ed6904499cff214af8f46 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef DatabaseCallback_h
 #define DatabaseCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/ThreadSafeRefCounted.h>
 
index a40e900ca7218713a14d720d0af01e12386aeabe..a52e5ceaa68c95d732a279cdcaed3465c6d9d1a2 100644 (file)
@@ -28,7 +28,7 @@
 
 module storage {
     interface [
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         LegacyDefaultOptionalArguments,
         Callback
     ] DatabaseCallback {
index c2217af7c1fac78130f49a8635cecfb1e09a9086..f5dc7878c2abc3c18d123c2dcc0772c24c429ffd 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef DatabaseDetails_h
 #define DatabaseDetails_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "PlatformString.h"
 
index bac186b2daab2bd26960dd96f60a2079e7f90692..c2a248ec47f986842e687be3ec1f728f190b0bb6 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 6563b23fb0fe2b77f40a10f34b2e48cfc6b9986e..71a6adbbbc543015bc96c3fdfb0d7f9aca5f74db 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 ff30b38cca2f34944a46c622f85ae6404d4356a6..4d352a6b84f122ecbcd5f62c2e64bf6c74c845f9 100644 (file)
@@ -31,7 +31,7 @@
 module storage {
 
     interface [
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] DatabaseSync {
index e9a4a39f877ff6abb2d34d51b558ccc23582cda4..3a12380ffc5dbc8ac12c2c3cf6eb8da10ffe1585 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 faadc69f976bd66c9497a03f33ab5d5e8318425f..4cc83ca16d791007a74582abaf00ee1111e2c17e 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 3b790ee73ca1b95b1ae1e400c9648fb9b181205f..cbde324e042f079e014c7de0b271ce7b36da42dd 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 ee1702cf1fc2cbddfb9bd18452f7347a24268207..d410edbce305e4c85189b555c95e58210c89eeb5 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 7fdc214fb8e30ad3e6c01ec986c4fc9185942d54..cd3339f4713d0ac4390351644ef2d4e260b71990 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 21cccbe9440732bf2c96ddfff0176fbbd7c50d31..492c148635e5efd729f0bc3b192639c3e9f95a17 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 2e0497f49821d4b7faf2b3c55a1ae0860c7cf2c5..9c08bcd3116439307e0e883e91c91beead803e60 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef DatabaseTrackerClient_h
 #define DatabaseTrackerClient_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/Forward.h>
 
index 0f415c17b815d4dad6ba7bc9a9388936e2898063..7229704820440a5bb0fbb05918d17fbb68a00950 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 82d7c7438ce07e98f466131127d91bd42b5fc8f9..974de7216806120f21df158f1fe2b9cf55f3dd63 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 eac08fd5deb7b41be9ea65d820afe65e4becfd94..443550a57309f3363f0fca98f508c0276d0d99db 100644 (file)
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "OriginUsageRecord.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include "SQLiteFileSystem.h"
 
index 7557eaa7b91e173564023ce72af926c92dd2d30a..61d9c9019cecbb4f63aa6f8c6227a6231cfea10a 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 81e34fa43d8c4aa1467ff3d107523c762b5879d4..34c7085637c5297e43a4c3030edaf31b3b551759 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 eb9005b472ee5361e23fe528c862df9cfe6c318d..6d823b17258b66c1b9294c54e2667af80cd73d28 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 87be8c7bdb79cfe3244399632ebebe51d94f088b..5c998f2af3d6efa927763a8969121190c6348a4a 100644 (file)
@@ -29,7 +29,7 @@
 module storage {
 
     interface [
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] SQLError {
index a0f118d6d1d9b821eec01a39b2aed64989eca632..fc881483dc3639b2ce989417a515e4d866eee040 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 cbbc311fd239a9c67dd4860b64d78afb25e031b9..60815dc34af17e9d3f8bf74c97b205cc4d96f737 100644 (file)
@@ -31,7 +31,7 @@
 module storage {
 
     interface [
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         NoStaticTables,
         DontCheckEnums
     ] SQLException {
index 7482628ae93f5c5c3316e442aa0e99c46a543d38..c3abcc88f6a5128d4afe2a26cb077c62402a4407 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "SQLResultSet.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 namespace WebCore {
 
index 964504cfac7559de19811ef834ebd9661eaecee7..a5f9a94aa1840ef7a789f7b59d8d1bc77f51a753 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 52f06dab0f937d130141dab550f3c2f46fc94dbc..1b48658973ac059e135fe6b7ffb73a5855be6405 100644 (file)
@@ -29,7 +29,7 @@
 module storage {
 
     interface [
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] SQLResultSet {
index c1e4844df76ae2ee3b0f3d96cac27de1055e0275..c99b40a567effa24831695e98b24d2a40d5cf558 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "SQLResultSetRowList.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 namespace WebCore {
 
index 92b5ec0ac3f3edb8a40fa571a4c2732f45320d17..9fc7195ddbeefcf7b8f4256ee6ca9911bbcda609 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 63002fb1d3e3e508159f3b2b62599d4ba5162edf..f04ee314d017411fff40d3eedf5f202095c94c62 100644 (file)
@@ -30,7 +30,7 @@ module storage {
 
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] SQLResultSetRowList {
index 58b7f71a75ca2c862f451dcbbce511b9a83eae84..b530325e3b19f6ef9c617d6184736ff1e51d919e 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 1d81eb237828c2ad155563c307e96686d6b827fb..0002501e70e99ce19e5d3b97d25c426bd733f91b 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 cae58274a24032dd82d7bb988b8d53162ace9355..83201d2b8029ad8dcc87ddc09af2d92fe0c1b967 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef SQLStatementCallback_h
 #define SQLStatementCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/ThreadSafeRefCounted.h>
 
index 14cfccd4c894c01ad889e4fcba5ce5d497379aea..8bd168d0f49e6e2a862a20fd0141f3dd1e5ee27b 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 5fecec4169c547521d5d1137b896f43b2e4b11fa..c7c9f5450b6d7c0fabe0e6596863d03f5f55ff81 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SQLStatementErrorCallback_h
 #define SQLStatementErrorCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/ThreadSafeRefCounted.h>
 
index 1710380a276d001ff4e18d62b6c55c7857435969..4c8d893f3ae0ad44be374091fb67576f9b6b5491 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 673d50da1af88f5d280a2a552daf6f9794c8f8fe..7f506bbd1fd1415d9508738ed2f6df0bfb66963b 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 d807e551b67214b289850eeacf5f3576c09ce353..1d1d727f6f75c1770b8739a8bfa3aea26bc7a955 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 f7053b54fc41d3cfea364d90e9d4a72228127a7d..382128741dbcbe2dfb6557991049b23fff39a693 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 3b6babd1e23cf610f80c4257d761c4530b52c6e0..55b588d20d7d4f268cd55f8a789621ffddf70072 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 672124ca40b01e8d5f7d5dd8ea67a084632347a3..52fe6a0a58f5e82df056c68b1be3890d11d727b5 100644 (file)
@@ -30,7 +30,7 @@ module storage {
 
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] SQLTransaction {
index 6904880805379814e200951b714133a41f28f7b0..208ce111b4d003215189f01b94724e11984b4763 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SQLTransactionCallback_h
 #define SQLTransactionCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/ThreadSafeRefCounted.h>
 
index d2ff93ac1d5ab8c547263384b08b1a080b29fc7c..066fde8f131bca3c8b55ac83123d432f5c3d26a1 100644 (file)
@@ -29,7 +29,7 @@
 module storage {
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         Callback
     ] SQLTransactionCallback {
         boolean handleEvent(in SQLTransaction transaction);
index 6b95606da2d0c801f5ec6714283896ff5c2cbac6..5dba32ed1aed0245807f775bb8d2a2bb3025e9c7 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 3c5ec2d63ffe7f89f271469bc4e83115a498a13e..28559ed49c0f2390ac1bdd4286b8d36cab187a29 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 104ea1046c84ce384dd92b8b43d8ff51bed4fdfc..4158c98d7ff874038e517b60d1973c728dcfab79 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 fd76782bdb3ef70506c5dc45f3eef0739cb34412..d586de4b7af6b7878ca2ed8e980203786bcb61f8 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 f06757157812ada771209ed226a9e95071df932b..56727cc05deb6b56deb4447d721258385faa5f75 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SQLTransactionErrorCallback_h
 #define SQLTransactionErrorCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/ThreadSafeRefCounted.h>
 
index 6cca1c9bdaf3547b6dceb5e7b7440af558a9d159..1d2082347a793ecc59f1f10225a454241e8a4531 100644 (file)
@@ -29,7 +29,7 @@
 module storage {
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         Callback
     ] SQLTransactionErrorCallback {
         boolean handleEvent(in SQLError error);
index 891c71c15113c75b3f2e85a127834eecf854e3f4..8f4c4cff4175a3c7a5656bd4f043361d742afc1a 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 329a2feff7925ec29a9f1219631ae3074abf88ee..a006d6af01d89484e511cec89599c74c300be764 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 8757dd28707fcd6e5e8b3dda3474a0339b08c56f..c2033f66b4bc8c5a5eb65fa0fd628beaf910b112 100644 (file)
@@ -32,7 +32,7 @@ module storage {
 
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         OmitConstructor,
         NoStaticTables
     ] SQLTransactionSync {
index f22e62f9bbb2375499427fc94fa24211d0826861..0c5f8fd63188c3be116a79224adeea9006e31854 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef SQLTransactionSyncCallback_h
 #define SQLTransactionSyncCallback_h
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #include <wtf/RefCounted.h>
 
index 93614a87c296c704b5bea5a2bdfd46c3ce2d5a53..18671354297dadb19aebe6aa9045593a1118545d 100644 (file)
@@ -31,7 +31,7 @@
 module storage {
     interface [
         LegacyDefaultOptionalArguments,
-        Conditional=DATABASE,
+        Conditional=SQL_DATABASE,
         Callback
     ] SQLTransactionSyncCallback {
         boolean handleEvent(in SQLTransactionSync transaction);
index deb803659598c9b6a38f53699f325ca24957272a..3394059454423162a4089f1961e1733e16c781da 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 89b0e7a86ad12a0a9a44b1ff5f8dc0db6083e160..ce8701ad637aa41f8914a92b8b6a4b2473187306 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 0448478070a80e541b19449468119b9bf8c1893c..a92bc5fe653b1a7220cd408beedb1eb1c1740f47 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 fcf49e52df6a0d3fee16dbf049eba1a84221914f..def731ed4a2364897ac9df2331e43994a6e7110e 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 f2e5455d7aa410cf7ef487413cd81007c2382245..d12f47193b6d3818334135eb206bd15546cf5153 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 39259c887a1e041d8181ea694cc7365723d899bf..5cf25e4d9374c37a0f4ea8ee835d212d63e54753 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 debc6ad1e8455ef1878d63e93cb51d85709a9e4d..ff7b6d7fb5453fc753a612c214c0cf298bb73f6f 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 1277d651f98aa64d8d5b5153c378e93f330fadaa..e6f8a8d439937b7b2b356b96e0b14781b8cf1984 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 5de03da31071e0e391e4205a90539ab193423f62..709ad602a2f9876f12dcddf018975cfdf2db3f47 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 4dea957265ed3c875064415887da8243b9156e11..843f430ebdf5313a9c0e291f472246cecfe82b46 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 26f5d123603f87b58f174f22c3a66204a05e40b1..cc8f22d436f7cb12f55b8496b1f19f642574f50d 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 f97dbe6ce8e42bbcc380434d28f81a84028fe740..20ebe381e2103f6d1ee4959fce1d2e8e58706410 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 3ac8d6d2597b8da20dbc4d4a6c9d3b25984a6fff..56e748fbde7eafe38790cb8afb10de3729cec19d 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 9e40bb8bcca14e12e1d22a21eec4a66ae56206b3..547a169ad6a72fd7167033d6245b0cb6e4a48f26 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 f82b18351414dfab3d575a2bb234d48c1590662b..a30a8b16e698f8a25e3233f488ad32be9c208e8a 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 6d05119f6edf269d16d26c92c94bc7ba2f22fa54..c92c367bbdd750448a12e966a0cc1b7b2a0e0c61 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 c190af756f11813ae484a04b7415348c6e78d9cf..815cfd274542ac7d27375c4b84e49b0069d7e12b 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 a3c82f37f94de2288aba6d8133336e542f776359..cf13e597f55ae9d2700a894369809a5f075723f5 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 86480ea66594b29bfa0a144c1baf97b3b6c231e5..c1c04273e57dbf83151a35416629212bc75ebeca 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 698cdebc290072605aa9f393daaa21c7a766062d..d0d40fc830c5d5c22c6a64d45199b396ec16556b 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 e4bcae879beef71618ad7b7b20f89ae3005bee8e..e4a4f64e8fcea60ca11effcd43ea1b09e77a2d97 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 40cd755ebe6cc253794589862987aba380cb554b..b9572fd3b45cadfbfbd84362706b9934d6d9a55d 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 e2edd849c6b2cd9d60f04fcc605d9d3955e76dbd..742c421556e19fa243422afc68134c6a5c76c22c 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 3e269c6f9875d2c3d2286951b34348c9140bdd20..3a12a81cde646b5967603e90d1f641e868bf9e66 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 6398c9dd5b93412c1620eb4ed70cf7401dd451fc..2f779872c23694da648f386a1675da69a08a8580 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 07e9cfe8b1a1007b178bc3571b85d985ae336345..8a4acccfb3339a4f43ea4af9348daa231ae0aa30 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 8c5e8a233eab58322f8d1fea46f240c5898092db..44c4313514cf3d082d0306d68ef9cac08930ac24 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 6a4ad1dda24780b6dbd6a02f0538524e0234e0f3..b461345c9c9c4297a1645a72de2b529d3bf4bb93 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 94d8109e17d00e39f2058c32bd260a746a6be9d3..6ce7e25ac6e552b648c3b52d70273178faa6666a 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 e26ae3368f739a71c1f604c16d9bf81bfe2b0349..476d583e3477e89399700ff06658ef7163a632c7 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 cbb5eb7fa1b3ffbb4681360e36d17b1405927700..ae7efa292ff19fd166855fc4cc767e807671a140 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 65aba437912b543a83f184d83389f6c43e812997..85031c1e9f8f89dc7473af3d2c7e572f21dc1dd5 100644 (file)
@@ -28,7 +28,7 @@
  
 #import "WebDatabaseTrackerClient.h"
 
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
 
 #import "WebDatabaseManagerPrivate.h"
 #import "WebSecurityOriginInternal.h"
index bd2d3ca2893d4d85a3c7b922f7425bde723eb542..4df10d0638334ad59b30c6d0230849025fb01ad1 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 cf5cdce85db73197521607d5b5223e705fb8a505..403605bb8dbd68e077786f873f0caefa02008efb 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 131a1ac1403f2c636652f9db87fd2b2da866b019..2373f8464be989c6922e270e23f1fc6c3edac91d 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 bd4460ab449d02cb6226b169cb31c4a50273c1b2..d6b84efe08231ec7358745da9409dd5b6a1996ae 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 efd3db1ccbb1b0d7c123e11c34faf460e91e3198..e1fd8a7d27445f1a2926008ae241122320ce9432 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 ba039c7fca91900e12ed27be7ff06e886f5a60e7..b26772089f8a60728b7c09274ddfa80ac7f68a36 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 97f887aa2733aa9b51a15e080b285c6275b9c47d..ccd9c5410b5513000d106384f750f0d4890aa909 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 3676f03e332ff39ace6377978cc500b75d1a55ff..24cc4329ad74e7110147aca0fdd0f20769439b0e 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 e619dca81e423b5ac4d3e81ceb54518b5bcc9795..4cf182a1ecfd0ff88a8eeebfbd94894a1ac77839 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 09a9377d464134bb22e156c739ec8edb389bc60e..69a6a845cf28560737d7c98ef3ffc56fbb49000e 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 66a5912782f3e9a1b602493dbc6cc199dfc97c77..b06fc2b3c63d9bc17627f99dafb62af3dd775150 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 2db10226f5c0fe61ad63e7273f970e1362790cfb..c16790f9876e9aedb1dee60d1f231f83c2388bf3 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 02aa097d3f2f399d53d7a05e1c3b51e7bf93d2ef..4bd3ebf11f49461433398322a1b5b44eeed59291 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 517a4f021766359ab2cb9b83ef8e7fced221171e..17c90fa541821bbdae26ebc3256fa1ca77213e8c 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 97e7ba1a1f56d81e35d6db1dea8a79bc9cc51816..2e84d1ec56e82f751829db5e02aa575887473389 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 e2b81e1f83fb27a98768d375cfdefdc8f21c29e9..090ce553b4f9fddeef317f16e7e7b9c083928d1e 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 b52cbd507b22c2e102e80dc727a877f36209b01a..3c5dd1ebe1da44e6fe95a0eb9ea687cf92b04e47 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 baec72e8341dd0cf4828aabf9d8090d2c2806528..61fcadf332b282bcebb6d02baed52e57758dd196 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 2f4361911d5c18059d7f6f21e51f42b0bf9fac0a..1ebd45e24f68c8cc1654fbf90d442db998ebaed2 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 502808210fa5b6b5380de2a31941713214d87832..c094a3b08cf93996ced72546c0ecbf05bb273db7 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 361aee574242d5e610e18fef976df5128198b479..4c40883519860ba24a1dd6cb1540ea892d240192 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 5c98d8fb6107618eebe99c10711584053046af8d..9033a7d32fe6c34f924c40d6a4e2b01fea1a3711 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 15c9092449a965fd4e4287bf081b967a4293718c..0602e000bd05c61ce673f28a3448a045b6ba74e6 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 9750c556e6f114b5e5181798e5c33ccda11cba76..857ef9e8ddac4442587f98c2b12a13ca44bd215a 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 dd8a964d67a1b2c0ddd588b4914abe1b992c197b..39bdf867f69f1e9dfbd39a9c2a874cc9e364bb30 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 2699ec9be378290230d63b32a109d0c9eaa06297..1989681b91694def158addfdf088cb546c3d5eb2 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 10f264827dfe55d297dc8b1c1347cb89e6b72dcf..fb155c006cf659e77e4c14f2f87cca97d9666bf4 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 80d8922a551ba34906f6fc3d7ee45f81df3913a3..a0dfa0c86fbbfb7c2f8e4a5606d30c95c6777115 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 b2222ac2c75de0d90972f793ae272135806f3291..60a279084ac5862ae18c1354652a0e31b451ab23 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 e2d67fc1ff16fa02312777786576ead0d424615e..bac27a9db605218223f9c4e2edd8b3b730de9816 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 9104253af7fee1811bc7d54ce1d23bd7d7138a1f..5b3eba1bcdda013599cd68424b23e007b06953ab 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 ecc99927f164a7923d7f9c70a9577d1bff9ab2e1..6e04a89c00ae220d2b88fa48dc669a957d53d25e 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 13ff21611c2281fee38735a11640f9dfcf7f0123..2be14ed23bd87d02158a2d71d26ffcebfa90f320 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 810d7d143eed15530207a2b3630f228d2659c4a4..4d14b4859f79f2087006a887c3496b992794da85 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 0543e51265eecfc662dfbb48da2c047ad399e975..0eaa1bdeb8d2bf886c2df945cfa20ce2b2949ee9 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 a79ba5de239af81315992bdb2abecb7a97453323..e4e1a91f6bc27fb2180e023ab895a21b9505ba79 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 4e66d5a072e762e8edcf83e8454f70bb97a2d770..0a5f9ae7bb3fda45951bc08e038acb25e09e3898 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 3b3f7752e60c76eb52f9b92d2d072b0149aff2da..13b14377b9b7d33f1ea2a8a6cf2fc8cdc641857f 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 e03ddbd0b7efbe9279a299baf008b141be7341e1..710d2cfcd8047353f98fda9f8becfa8ce0968212 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