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: http://svn.webkit.org/repository/webkit/trunk@95271
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+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
+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)
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 = ;
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);
#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)
)
ENDIF ()
-IF (ENABLE_DATABASE)
+IF (ENABLE_SQL_DATABASE)
LIST(APPEND WebCore_SOURCES
platform/sql/SQLValue.cpp
platform/sql/SQLiteAuthorizer.cpp
+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
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 = ;
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);
# ----
# 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
# ----
# Database Support
# ----
-if ENABLE_DATABASE
+if ENABLE_SQL_DATABASE
webcore_built_sources += \
DerivedSources/WebCore/JSDatabase.cpp \
DerivedSources/WebCore/JSDatabase.h \
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
)
ENDIF ()
-IF (ENABLE_DATABASE)
+IF (ENABLE_SQL_DATABASE)
LIST(APPEND WebCore_SOURCES
bindings/js/JSCustomSQLStatementErrorCallback.cpp
bindings/js/JSSQLResultSetRowListCustom.cpp
}
-contains(DEFINES, ENABLE_DATABASE=1) {
+contains(DEFINES, ENABLE_SQL_DATABASE=1) {
SOURCES += \
storage/ChangeVersionWrapper.cpp \
storage/DatabaseTask.cpp \
}
#endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
bool RuntimeEnabledFeatures::openDatabaseEnabled()
{
return AbstractDatabase::isAvailable();
static bool webSocketEnabled();
#endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
static bool openDatabaseEnabled();
static bool openDatabaseSyncEnabled();
#endif
#include "config.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "JSSQLStatementErrorCallback.h"
}
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#include "JSOperationNotAllowedException.h"
#endif
#include "JSRangeException.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "JSSQLException.h"
#endif
#if ENABLE(SVG)
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;
#include "JSEventException.h"
#include "JSRangeException.h"
#include "JSXMLHttpRequestException.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "SQLException.h"
#include "JSSQLException.h"
#endif
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
#include "JSInjectedScriptHost.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "Database.h"
#include "JSDatabase.h"
#endif
{
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));
#include "config.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "JSSQLResultSetRowList.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#include "config.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "JSSQLTransaction.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#include "config.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "JSSQLTransactionSync.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#include "config.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "WebDOMTestCallback.h"
return WebDOMTestCallback(value);
}
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef WebDOMTestCallback_h
#define WebDOMTestCallback_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <WebDOMObject.h>
#include <WebDOMString.h>
WebDOMTestCallback toWebKit(WebCore::TestCallback*);
#endif
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#include <glib-object.h>
#include "config.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <wtf/GetPtr.h>
#include <wtf/RefPtr.h>
"core-object", coreObject, NULL));
}
} // namespace WebKit
-#endif /* ENABLE(DATABASE) */
+#endif // ENABLE(SQL_DATABASE)
#include "config.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "JSTestCallback.h"
}
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef JSTestCallback_h
#define JSTestCallback_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "ActiveDOMCallback.h"
#include "JSCallbackData.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif
#import "config.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#import "DOMInternal.h"
return [wrapper autorelease];
}
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
// that has the "Callback" attribute and for tracking changes in its ouput.
module test {
interface [
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
LegacyDefaultOptionalArguments,
Callback
] TestCallback {
#include "config.h"
#include "V8TestCallback.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "ScriptExecutionContext.h"
#include "V8Binding.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
Boston, MA 02111-1307, USA.
*/
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#ifndef V8TestCallback_h
#define V8TestCallback_h
#endif // V8TestCallback_h
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
exception = toV8(XPathException::create(description));
break;
#endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
case SQLExceptionType:
exception = toV8(SQLException::create(description));
break;
static const char* svgExceptionName(int exceptionCode);
#endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
static const char* sqlExceptionName(int exceptionCode);
#endif
#include "config.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "V8SQLStatementErrorCallback.h"
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)
#include "config.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "V8SQLResultSetRowList.h"
#include "SQLResultSetRowList.h"
#include "config.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "V8SQLTransaction.h"
#include "config.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "V8SQLTransactionSync.h"
initDNSPrefetch();
}
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
bool Document::allowDatabaseAccess() const
{
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
#include "XPathException.h"
#endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "SQLException.h"
#endif
};
#endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
static const char* const sqlExceptionNames[] = {
"UNKNOWN_ERR",
"DATABASE_ERR",
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";
#if ENABLE(SVG)
, SVGExceptionType
#endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
, SQLExceptionType
#endif
#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
: m_iteratingActiveDOMObjects(false)
, m_inDestructor(false)
, m_inDispatchErrorEvent(false)
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
, m_hasOpenDatabases(false)
#endif
{
ASSERT((*iter)->scriptExecutionContext() == this);
(*iter)->contextDestroyed();
}
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
if (m_databaseThread) {
ASSERT(m_databaseThread->terminationRequested());
m_databaseThread = 0;
#endif
}
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
DatabaseThread* ScriptExecutionContext::databaseThread()
{
class ScriptCallStack;
class SecurityOrigin;
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
class Database;
class DatabaseTaskSynchronizer;
class DatabaseThread;
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();
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
}
# 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
# 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
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
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;
&& !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)
#include "InspectorValues.h"
#include "Pasteboard.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "Database.h"
#endif
InjectedScriptHost::InjectedScriptHost()
: m_inspectorAgent(0)
, m_consoleAgent(0)
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
, m_databaseAgent(0)
#endif
#if ENABLE(DOM_STORAGE)
{
m_inspectorAgent = 0;
m_consoleAgent = 0;
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
m_databaseAgent = 0;
#endif
#if ENABLE(DOM_STORAGE)
return 0;
}
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
int InjectedScriptHost::databaseIdImpl(Database* database)
{
if (m_databaseAgent)
void init(InspectorAgent* inspectorAgent
, InspectorConsoleAgent* consoleAgent
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
, InspectorDatabaseAgent* databaseAgent
#endif
#if ENABLE(DOM_STORAGE)
{
m_inspectorAgent = inspectorAgent;
m_consoleAgent = consoleAgent;
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
m_databaseAgent = databaseAgent;
#endif
#if ENABLE(DOM_STORAGE)
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)
InspectorAgent* m_inspectorAgent;
InspectorConsoleAgent* m_consoleAgent;
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
InspectorDatabaseAgent* m_databaseAgent;
#endif
#if ENABLE(DOM_STORAGE)
, 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)
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)
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)
#if ENABLE(DOM_STORAGE)
m_domStorageAgent.get(),
#endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
m_databaseAgent.get(),
#endif
#if ENABLE(JAVASCRIPT_DEBUGGER)
m_cssAgent->clearFrontend();
m_timelineAgent->clearFrontend();
m_resourceAgent->clearFrontend();
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
m_databaseAgent->clearFrontend();
#endif
#if ENABLE(DOM_STORAGE)
m_resourceAgent->restore();
m_timelineAgent->restore();
m_consoleAgent->restore();
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
m_databaseAgent->restore();
#endif
#if ENABLE(DOM_STORAGE)
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)
#include "InspectorDatabaseAgent.h"
-#if ENABLE(INSPECTOR) && ENABLE(DATABASE)
+#if ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
#include "Database.h"
#include "ExceptionCode.h"
} // namespace WebCore
-#endif // ENABLE(INSPECTOR) && ENABLE(DATABASE)
+#endif // ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
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)
#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"
} // namespace WebCore
-#endif // ENABLE(DATABASE) && ENABLE(INSPECTOR)
+#endif // ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
#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>
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif // InspectorDatabaseResource_h
#endif
if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())
cssAgent->reset();
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
if (InspectorDatabaseAgent* databaseAgent = instrumentingAgents->inspectorDatabaseAgent())
databaseAgent->clearResources();
#endif
}
#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();
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
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
#if ENABLE(DOM_STORAGE)
, m_inspectorDOMStorageAgent(0)
#endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
, m_inspectorDatabaseAgent(0)
#endif
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
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
#if ENABLE(DOM_STORAGE)
InspectorDOMStorageAgent* m_inspectorDOMStorageAgent;
#endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
InspectorDatabaseAgent* m_inspectorDatabaseAgent;
#endif
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
{
m_injectedScriptManager->injectedScriptHost()->init(0
, 0
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
, 0
#endif
#if ENABLE(DOM_STORAGE)
#if ENABLE(DOM_STORAGE)
0, // InspectorDOMStorageAgent
#endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
0, // InspectorDatabaseAgent
#endif
#if ENABLE(JAVASCRIPT_DEBUGGER)
ref_types = {}
macro_traits = {
- "Database": "DATABASE",
+ "Database": "SQL_DATABASE",
"DOMStorage": "DOM_STORAGE",
"ApplicationCache": "OFFLINE_WEB_APPLICATIONS",
"Debugger": "JAVASCRIPT_DEBUGGER",
virtual void print(Frame*) { }
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
virtual void exceededDatabaseQuota(Frame*, const String&) { }
#endif
// 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
}
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
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;
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
#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
#endif
#endif
- attribute [Conditional=DATABASE] SQLExceptionConstructor SQLException;
+ attribute [Conditional=SQL_DATABASE] SQLExceptionConstructor SQLException;
attribute DOMFormDataConstructor FormData;
#include "config.h"
#include "DatabaseAuthorizer.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
#include <sqlite3.h>
namespace WebCore {
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#include "config.h"
#include "SQLiteDatabase.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
#include "DatabaseAuthorizer.h"
#include "Logging.h"
#include "SQLiteFileSystem.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#include "config.h"
#include "SQLiteFileSystem.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "FileSystem.h"
#include "SQLiteDatabase.h"
}
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+
+#endif // ENABLE(SQL_DATABASE)
#include "config.h"
#include "SQLiteStatement.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "Logging.h"
#include "SQLValue.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#include "config.h"
#include "SQLiteTransaction.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "SQLiteDatabase.h"
}
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+
+#endif // ENABLE(SQL_DATABASE)
#include "config.h"
#include "AbstractDatabase.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
#include "DatabaseAuthorizer.h"
#include "DatabaseTracker.h"
#include "Logging.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef AbstractDatabase_h
#define AbstractDatabase_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "ExceptionCode.h"
#include "PlatformString.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif // AbstractDatabase_h
#include "config.h"
#include "ChangeVersionWrapper.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
#include "Database.h"
#include "SQLError.h"
#include <wtf/PassRefPtr.h>
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef ChangeVersionWrapper_h
#define ChangeVersionWrapper_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "PlatformString.h"
#include "SQLTransaction.h"
#include "config.h"
#include "Database.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
#include "ChangeVersionWrapper.h"
#include "DatabaseCallback.h"
#include "DatabaseTask.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef Database_h
#define Database_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
#include "AbstractDatabase.h"
#include "ExceptionCode.h"
#include "PlatformString.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif // Database_h
module storage {
interface [
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
OmitConstructor,
NoStaticTables
] Database {
#include "config.h"
#include "DatabaseAuthorizer.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "PlatformString.h"
#include <wtf/PassRefPtr.h>
#ifndef DatabaseCallback_h
#define DatabaseCallback_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <wtf/ThreadSafeRefCounted.h>
module storage {
interface [
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
LegacyDefaultOptionalArguments,
Callback
] DatabaseCallback {
#ifndef DatabaseDetails_h
#define DatabaseDetails_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "PlatformString.h"
#include "config.h"
#include "DatabaseSync.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
#include "DatabaseCallback.h"
#include "DatabaseTracker.h"
#include "Logging.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef DatabaseSync_h
#define DatabaseSync_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
#include "AbstractDatabase.h"
#include "ExceptionCode.h"
#include "PlatformString.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
-#endif // DatabaseSync_h
+#endif
module storage {
interface [
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
OmitConstructor,
NoStaticTables
] DatabaseSync {
#include "config.h"
#include "DatabaseTask.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "Database.h"
#include "Logging.h"
#ifndef DatabaseTask_h
#define DatabaseTask_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
#include "Database.h"
#include "ExceptionCode.h"
#include "PlatformString.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
+
#endif // DatabaseTask_h
#include "config.h"
#include "DatabaseThread.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "AutodrainedPool.h"
#include "Database.h"
#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>
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif // DatabaseThread_h
#include "config.h"
#include "DatabaseTracker.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "AbstractDatabase.h"
#include "Chrome.h"
#ifndef DatabaseTracker_h
#define DatabaseTracker_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "PlatformString.h"
#include <wtf/HashMap.h>
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
+
#endif // DatabaseTracker_h
#ifndef DatabaseTrackerClient_h
#define DatabaseTrackerClient_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <wtf/Forward.h>
#include "config.h"
#include "OriginQuotaManager.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "AbstractDatabase.h"
#include "OriginUsageRecord.h"
}
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef OriginQuotaManager_h
#define OriginQuotaManager_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "SecurityOriginHash.h"
#include <wtf/HashMap.h>
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif // OriginQuotaManager_h
#include "config.h"
#include "OriginUsageRecord.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "SQLiteFileSystem.h"
#ifndef OriginUsageRecord_h
#define OriginUsageRecord_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "PlatformString.h"
#include <wtf/HashMap.h>
#ifndef SQLCallbackWrapper_h
#define SQLCallbackWrapper_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "CrossThreadTask.h"
#include "ScriptExecutionContext.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif // SQLCallbackWrapper_h
#ifndef SQLError_h
#define SQLError_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "PlatformString.h"
#include <wtf/ThreadSafeRefCounted.h>
module storage {
interface [
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
OmitConstructor,
NoStaticTables
] SQLError {
#ifndef SQLException_h
#define SQLException_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "ExceptionBase.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif // SQLException_h
module storage {
interface [
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
NoStaticTables,
DontCheckEnums
] SQLException {
#include "config.h"
#include "SQLResultSet.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
namespace WebCore {
#ifndef SQLResultSet_h
#define SQLResultSet_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "ExceptionCode.h"
#include "SQLResultSetRowList.h"
module storage {
interface [
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
OmitConstructor,
NoStaticTables
] SQLResultSet {
#include "config.h"
#include "SQLResultSetRowList.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
namespace WebCore {
#ifndef SQLResultSetRowList_h
#define SQLResultSetRowList_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <wtf/PassRefPtr.h>
#include "SQLValue.h"
interface [
LegacyDefaultOptionalArguments,
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
OmitConstructor,
NoStaticTables
] SQLResultSetRowList {
#include "config.h"
#include "SQLStatement.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "Database.h"
#include "Logging.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef SQLStatement_h
#define SQLStatement_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "PlatformString.h"
#include "SQLCallbackWrapper.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif // SQLStatement_h
#ifndef SQLStatementCallback_h
#define SQLStatementCallback_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <wtf/ThreadSafeRefCounted.h>
module storage {
interface [
LegacyDefaultOptionalArguments,
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
Callback
] SQLStatementCallback {
boolean handleEvent(in SQLTransaction transaction, in SQLResultSet resultSet);
#ifndef SQLStatementErrorCallback_h
#define SQLStatementErrorCallback_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <wtf/ThreadSafeRefCounted.h>
module storage {
interface [
LegacyDefaultOptionalArguments,
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
Callback
] SQLStatementErrorCallback {
[Custom] boolean handleEvent(in SQLTransaction transaction, in SQLError error);
#include "config.h"
#include "SQLStatementSync.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "DatabaseSync.h"
#include "SQLException.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef SQLStatementSync_h
#define SQLStatementSync_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "ExceptionCode.h"
#include "PlatformString.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif // SQLStatementSync_h
#include "config.h"
#include "SQLTransaction.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "Database.h"
#include "DatabaseAuthorizer.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef SQLTransaction_h
#define SQLTransaction_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "ExceptionCode.h"
#include "SQLStatement.h"
interface [
LegacyDefaultOptionalArguments,
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
OmitConstructor,
NoStaticTables
] SQLTransaction {
#ifndef SQLTransactionCallback_h
#define SQLTransactionCallback_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <wtf/ThreadSafeRefCounted.h>
module storage {
interface [
LegacyDefaultOptionalArguments,
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
Callback
] SQLTransactionCallback {
boolean handleEvent(in SQLTransaction transaction);
#include "config.h"
#include "SQLTransactionClient.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "AbstractDatabase.h"
#include "DatabaseTracker.h"
}
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef SQLTransactionClient_h
#define SQLTransactionClient_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <wtf/FastAllocBase.h>
#include <wtf/Noncopyable.h>
}
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif // SQLTransactionClient_h
#include "config.h"
#include "SQLTransactionCoordinator.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "Database.h"
#include "SQLTransaction.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef SQLTransactionCoordinator_h
#define SQLTransactionCoordinator_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <wtf/Deque.h>
#include <wtf/HashMap.h>
};
}
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif // SQLTransactionCoordinator_h
#ifndef SQLTransactionErrorCallback_h
#define SQLTransactionErrorCallback_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <wtf/ThreadSafeRefCounted.h>
module storage {
interface [
LegacyDefaultOptionalArguments,
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
Callback
] SQLTransactionErrorCallback {
boolean handleEvent(in SQLError error);
#include "config.h"
#include "SQLTransactionSync.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "DatabaseAuthorizer.h"
#include "DatabaseSync.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef SQLTransactionSync_h
#define SQLTransactionSync_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "ExceptionCode.h"
#include "PlatformString.h"
interface [
LegacyDefaultOptionalArguments,
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
OmitConstructor,
NoStaticTables
] SQLTransactionSync {
#ifndef SQLTransactionSyncCallback_h
#define SQLTransactionSyncCallback_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <wtf/RefCounted.h>
module storage {
interface [
LegacyDefaultOptionalArguments,
- Conditional=DATABASE,
+ Conditional=SQL_DATABASE,
Callback
] SQLTransactionSyncCallback {
boolean handleEvent(in SQLTransactionSync transaction);
#ifndef DatabaseObserver_h
#define DatabaseObserver_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <wtf/Forward.h>
}
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif // DatabaseObserver_h
#include "config.h"
#include "DatabaseTracker.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "AbstractDatabase.h"
#include "DatabaseObserver.h"
}
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#include "QuotaTracker.h"
#include "PlatformSupport.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include <wtf/StdLibExtras.h>
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#ifndef QuotaTracker_h
#define QuotaTracker_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "PlatformString.h"
#include "SecurityOrigin.h"
}
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#endif // QuotaTracker_h
#include "config.h"
#include "SQLTransactionClient.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "AbstractDatabase.h"
#include "DatabaseObserver.h"
}
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
}
#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()) {
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&);
// 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)
#include <utility>
#include <wtf/Noncopyable.h>
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "DatabaseTask.h"
#include "DatabaseTracker.h"
#endif
ASSERT(context->isWorkerContext());
WorkerContext* workerContext = static_cast<WorkerContext*>(context);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
DatabaseTaskSynchronizer cleanupSync;
workerContext->stopDatabases(&cleanupSync);
#endif
// 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();
if (m_workerContext) {
m_workerContext->script()->scheduleExecutionTermination();
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
DatabaseTracker::tracker().interruptAllDatabasesForContext(m_workerContext.get());
#endif
+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
#include "config.h"
#include "DatabaseObserver.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "AbstractDatabase.h"
#include "CrossThreadCopier.h"
} // namespace WebCore
-#endif // ENABLE(DATABASE)
+#endif // ENABLE(SQL_DATABASE)
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
-#if !ENABLE(DATABASE)
+#if !ENABLE(SQL_DATABASE)
namespace WebCore {
class AbstractDatabase {
public:
SecurityOrigin* securityOrigin() const { return 0; }
};
}
-#endif // !ENABLE(DATABASE)
+#endif // !ENABLE(SQL_DATABASE)
using namespace WebCore;
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)
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;
+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.
#include "config.h"
#include "ChromeClientEfl.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
+
#include "DatabaseDetails.h"
#include "DatabaseTracker.h"
#endif
}
#endif
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
void ChromeClientEfl::exceededDatabaseQuota(Frame* frame, const String& databaseName)
{
uint64_t quota;
virtual void print(Frame*);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
virtual void exceededDatabaseQuota(Frame*, const String&);
#endif
#include "ewk_settings.h"
#include "EWebKit.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "DatabaseTracker.h"
#endif
#include "FrameView.h"
#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
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;
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)
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;
+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.
#include <gtk/gtk.h>
#include <wtf/text/CString.h>
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "DatabaseTracker.h"
#endif
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();
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)
{
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
{
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
{
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
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;
{
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();
{
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();
{
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();
{
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);
{
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
**/
void webkit_remove_all_web_databases()
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
WebCore::DatabaseTracker::tracker().deleteAllDatabases();
#endif
}
**/
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())
**/
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);
coreSettings->setHyperlinkAuditingEnabled(settingsPrivate->enableHyperlinkAuditing);
coreSettings->setDNSPrefetchingEnabled(settingsPrivate->enableDNSPrefetching);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
AbstractDatabase::setIsAvailable(settingsPrivate->enableHTML5Database);
#endif
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));
}
+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
void print(Frame*);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
virtual void exceededDatabaseQuota(Frame*, const String& databaseName);
#endif
+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)
#import "WebDatabaseManagerPrivate.h"
#import "WebDatabaseManagerInternal.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#import "WebDatabaseTrackerClient.h"
#import "WebSecurityOriginInternal.h"
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
void WebKitInitializeDatabasesIfNecessary();
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if ENABLE(DATABASE)
-
+#if ENABLE(SQL_DATABASE)
+
extern NSString *WebDatabaseDirectoryDefaultsKey;
extern NSString *WebDatabaseDisplayNameKey;
- (unsigned long long)usage
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
return DatabaseTracker::tracker().usageForOrigin([_origin _core]);
#else
return 0;
- (unsigned long long)quota
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
return DatabaseTracker::tracker().quotaForOrigin([_origin _core]);
#else
return 0;
// 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
}
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#import <WebCore/DatabaseTrackerClient.h>
#import "WebDatabaseTrackerClient.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#import "WebDatabaseManagerPrivate.h"
#import "WebSecurityOriginInternal.h"
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)
CallUIDelegate(m_webView, @selector(webView:printFrameView:), [webFrame frameView]);
}
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseName)
{
- (unsigned long long)usage
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
return DatabaseTracker::tracker().usageForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
#else
return 0;
- (unsigned long long)quota
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
return DatabaseTracker::tracker().quotaForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
#else
return 0;
- (void)setQuota:(unsigned long long)quota
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
DatabaseTracker::tracker().setQuota(reinterpret_cast<SecurityOrigin*>(_private), quota);
#endif
}
}
if (Document* document = _private->coreFrame->document()) {
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
if (document->hasOpenDatabases())
[result setObject:[NSNumber numberWithBool:YES] forKey:WebFrameUsesDatabases];
#endif
WebKitInitializeLoggingChannelsIfNecessary();
WebCore::InitializeLoggingChannelsIfNecessary();
[WebHistoryItem initWindowWatcherIfNecessary];
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
WebKitInitializeDatabasesIfNecessary();
#endif
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]);
*/
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
*/
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
*/
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
*/
QString QWebDatabase::fileName() const
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
return DatabaseTracker::tracker().fullPathForDatabase(d->origin.get(), d->name, false);
#else
return QString();
*/
void QWebDatabase::removeDatabase(const QWebDatabase& db)
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
DatabaseTracker::tracker().deleteDatabase(db.d->origin.get(), db.d->name);
#endif
}
*/
void QWebDatabase::removeAllDatabases()
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
DatabaseTracker::tracker().deleteAllDatabases();
#endif
}
*/
qint64 QWebSecurityOrigin::databaseUsage() const
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
return DatabaseTracker::tracker().usageForOrigin(d->origin.get());
#else
return 0;
*/
qint64 QWebSecurityOrigin::databaseQuota() const
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
return DatabaseTracker::tracker().quotaForOrigin(d->origin.get());
#else
return 0;
*/
void QWebSecurityOrigin::setDatabaseQuota(qint64 quota)
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
DatabaseTracker::tracker().setQuota(d->origin.get(), quota);
#endif
}
{
QList<QWebSecurityOrigin> webOrigins;
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
Vector<RefPtr<SecurityOrigin> > coreOrigins;
DatabaseTracker::tracker().origins(coreOrigins);
{
QList<QWebDatabase> databases;
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
Vector<String> nameVector;
if (!DatabaseTracker::tracker().databaseNamesForOrigin(d->origin.get(), nameVector))
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);
*/
void QWebSettings::setOfflineStoragePath(const QString& path)
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
WebCore::DatabaseTracker::tracker().setDatabaseDirectoryPath(path);
#endif
}
*/
QString QWebSettings::offlineStoragePath()
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
return WebCore::DatabaseTracker::tracker().databaseDirectoryPath();
#else
return QString();
+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
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();
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)
+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.
#include "ProgIDMacros.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#define WEB_DATABASE_MANAGER(macro) macro(WebDatabaseManager)
#else
#define WEB_DATABASE_MANAGER(macro)
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()));
virtual void print(WebCore::Frame*);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String&);
#endif
#include "WebDatabaseManager.h"
#include "WebKitDLL.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "CFDictionaryPropertyBag.h"
#include "COMEnumVariant.h"
#ifndef WebDatabaseManager_h
#define WebDatabaseManager_h
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "WebKit.h"
#include <WebCore/DatabaseTrackerClient.h>
#include <WebCore/BString.h>
#include <WebCore/DatabaseTracker.h>
-#if !ENABLE(DATABASE)
+#if !ENABLE(SQL_DATABASE)
#include <wtf/UnusedParam.h>
#endif
HRESULT STDMETHODCALLTYPE WebSecurityOrigin::usage(
/* [retval][out] */ unsigned long long* result)
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
if (!result)
return E_POINTER;
HRESULT STDMETHODCALLTYPE WebSecurityOrigin::quota(
/* [retval][out] */ unsigned long long* result)
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
if (!result)
return E_POINTER;
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;
static bool didOneTimeInitialization;
if (!didOneTimeInitialization) {
InitializeLoggingChannelsIfNecessary();
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
WebKitInitializeWebDatabasesIfNecessary();
#endif
WebKitSetApplicationCachePathIfNecessary();
return hr;
settings->setOfflineWebApplicationCacheEnabled(enabled);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
hr = prefsPrivate->databasesEnabled(&enabled);
if (FAILED(hr))
return hr;
+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.
notImplemented();
}
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
void ChromeClientWinCE::exceededDatabaseQuota(Frame*, const String&)
{
notImplemented();
virtual void print(WebCore::Frame*);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName);
#endif
+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.
#include "config.h"
#include "ChromeClientWx.h"
#include "Console.h"
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "DatabaseTracker.h"
#endif
#include "FileChooser.h"
}
}
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
void ChromeClientWx::exceededDatabaseQuota(Frame*, const String&)
{
unsigned long long quota = 5 * 1024 * 1024;
virtual void print(Frame*);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
virtual void exceededDatabaseQuota(Frame*, const String&);
#endif
#include <wtf/MainThread.h>
#include <wtf/text/CString.h>
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
#include "AbstractDatabase.h"
#include "DatabaseTracker.h"
#endif
settings->setStandardFontFamily("Times New Roman");
settings->setJavaScriptEnabled(true);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
SetDatabasesEnabled(true);
#endif
/* static */
void wxWebView::SetDatabaseDirectory(const wxString& databaseDirectory)
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
WebCore::DatabaseTracker::tracker().setDatabaseDirectoryPath(databaseDirectory);
#endif
}
/* static */
wxString wxWebView::GetDatabaseDirectory()
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
return WebCore::DatabaseTracker::tracker().databaseDirectoryPath();
#else
return wxEmptyString;
/* static */
void wxWebView::SetDatabasesEnabled(bool enabled)
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
WebCore::AbstractDatabase::setIsAvailable(enabled);
#endif
}
/* static */
bool wxWebView::AreDatabasesEnabled()
{
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
return WebCore::AbstractDatabase::isAvailable();
#endif
return false;
+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
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();
virtual void print(WebCore::Frame*);
-#if ENABLE(DATABASE)
+#if ENABLE(SQL_DATABASE)
virtual void exceededDatabaseQuota(WebCore::Frame*, const String& databaseName);
#endif
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
}
}
-#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
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)
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)
#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
$clientBasedGeolocationSupport,
$coverageSupport,
$css3FlexboxSupport,
- $databaseSupport,
+ $sqlDatabaseSupport,
$datalistSupport,
$dataTransferItemsSupport,
$detailsSupport,
{ 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 },
+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
>
<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"
PerformEnvironmentSet="true"
/>
<UserMacro
- Name="ENABLE_DATABASE"
- Value="ENABLE_DATABASE"
+ Name="ENABLE_SQL_DATABASE"
+ Value="ENABLE_SQL_DATABASE"
PerformEnvironmentSet="true"
/>
<UserMacro
>
<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"
PerformEnvironmentSet="true"
/>
<UserMacro
- Name="ENABLE_DATABASE"
- Value="ENABLE_DATABASE"
+ Name="ENABLE_SQL_DATABASE"
+ Value="ENABLE_SQL_DATABASE"
PerformEnvironmentSet="true"
/>
<UserMacro
[],[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])
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])
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"])
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
projects / profile / ivi / webkit-efl.git / commitdiff