https://bugs.webkit.org/show_bug.cgi?id=140434
Reviewed by Darin Adler.
.:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:
Source/JavaScriptCore:
* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* DerivedSources.make:
* inspector/protocol/Database.json:
Source/WebCore:
* Configurations/FeatureDefines.xcconfig:
* Modules/webdatabase/AbstractDatabaseServer.h:
* Modules/webdatabase/ChangeVersionData.h:
* Modules/webdatabase/ChangeVersionWrapper.cpp:
* Modules/webdatabase/ChangeVersionWrapper.h:
* Modules/webdatabase/DOMWindowWebDatabase.cpp:
* Modules/webdatabase/DOMWindowWebDatabase.h:
* Modules/webdatabase/DOMWindowWebDatabase.idl:
* Modules/webdatabase/Database.cpp:
* Modules/webdatabase/Database.h:
* Modules/webdatabase/Database.idl:
* Modules/webdatabase/DatabaseBackend.cpp:
* Modules/webdatabase/DatabaseBackend.h:
* Modules/webdatabase/DatabaseBackendBase.cpp:
* Modules/webdatabase/DatabaseBackendBase.h:
* Modules/webdatabase/DatabaseBasicTypes.h:
* Modules/webdatabase/DatabaseCallback.h:
* Modules/webdatabase/DatabaseCallback.idl:
* Modules/webdatabase/DatabaseContext.cpp:
* Modules/webdatabase/DatabaseContext.h:
* Modules/webdatabase/DatabaseDetails.h:
* Modules/webdatabase/DatabaseError.h:
* Modules/webdatabase/DatabaseManager.cpp:
* Modules/webdatabase/DatabaseManager.h:
* Modules/webdatabase/DatabaseManagerClient.h:
* Modules/webdatabase/DatabaseServer.cpp:
* Modules/webdatabase/DatabaseServer.h:
* Modules/webdatabase/DatabaseTask.cpp:
* Modules/webdatabase/DatabaseTask.h:
* Modules/webdatabase/DatabaseThread.cpp:
* Modules/webdatabase/DatabaseThread.h:
* Modules/webdatabase/DatabaseTracker.cpp:
* Modules/webdatabase/DatabaseTracker.h:
* Modules/webdatabase/OriginLock.cpp:
* Modules/webdatabase/OriginLock.h:
* Modules/webdatabase/SQLCallbackWrapper.h:
* Modules/webdatabase/SQLError.h:
* Modules/webdatabase/SQLError.idl:
* Modules/webdatabase/SQLException.cpp:
* Modules/webdatabase/SQLException.h:
* Modules/webdatabase/SQLException.idl:
* Modules/webdatabase/SQLResultSet.cpp:
* Modules/webdatabase/SQLResultSet.h:
* Modules/webdatabase/SQLResultSet.idl:
* Modules/webdatabase/SQLResultSetRowList.cpp:
* Modules/webdatabase/SQLResultSetRowList.h:
* Modules/webdatabase/SQLResultSetRowList.idl:
* Modules/webdatabase/SQLStatement.cpp:
* Modules/webdatabase/SQLStatement.h:
* Modules/webdatabase/SQLStatementBackend.cpp:
* Modules/webdatabase/SQLStatementBackend.h:
* Modules/webdatabase/SQLStatementCallback.h:
* Modules/webdatabase/SQLStatementCallback.idl:
* Modules/webdatabase/SQLStatementErrorCallback.h:
* Modules/webdatabase/SQLStatementErrorCallback.idl:
* Modules/webdatabase/SQLTransaction.cpp:
* Modules/webdatabase/SQLTransaction.h:
* Modules/webdatabase/SQLTransaction.idl:
* Modules/webdatabase/SQLTransactionBackend.cpp:
* Modules/webdatabase/SQLTransactionBackend.h:
* Modules/webdatabase/SQLTransactionCallback.h:
* Modules/webdatabase/SQLTransactionCallback.idl:
* Modules/webdatabase/SQLTransactionClient.cpp:
* Modules/webdatabase/SQLTransactionClient.h:
* Modules/webdatabase/SQLTransactionCoordinator.cpp:
* Modules/webdatabase/SQLTransactionCoordinator.h:
* Modules/webdatabase/SQLTransactionErrorCallback.h:
* Modules/webdatabase/SQLTransactionErrorCallback.idl:
* Modules/webdatabase/SQLTransactionState.h:
* Modules/webdatabase/SQLTransactionStateMachine.cpp:
* Modules/webdatabase/SQLTransactionStateMachine.h:
* bindings/js/JSCommandLineAPIHostCustom.cpp:
(WebCore::JSCommandLineAPIHost::databaseId):
* bindings/js/JSCustomSQLStatementErrorCallback.cpp:
* bindings/js/JSExceptionBase.cpp:
(WebCore::toExceptionBase):
* bindings/js/JSSQLResultSetRowListCustom.cpp:
* bindings/js/JSSQLTransactionCustom.cpp:
* bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
(webkit_dom_test_callback_finalize):
(webkit_dom_test_callback_constructor):
(webkit_dom_test_callback_callback_with_no_param):
(webkit_dom_test_callback_callback_with_array_param):
(webkit_dom_test_callback_callback_with_serialized_script_value_param):
(webkit_dom_test_callback_callback_with_non_bool_return_type):
(webkit_dom_test_callback_callback_with_string_list):
(webkit_dom_test_callback_callback_with_boolean):
(webkit_dom_test_callback_callback_requires_this_to_pass):
* bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h:
* bindings/scripts/test/JS/JSTestCallback.cpp:
* bindings/scripts/test/JS/JSTestCallback.h:
* bindings/scripts/test/ObjC/DOMTestCallback.mm:
* bindings/scripts/test/TestCallback.idl:
* dom/DOMExceptions.in:
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::setDatabaseContext):
* dom/ScriptExecutionContext.h:
* history/PageCache.cpp:
(WebCore::logCanCacheFrameDecision):
(WebCore::PageCache::canCachePageContainingThisFrame):
* inspector/CommandLineAPIHost.cpp:
(WebCore::CommandLineAPIHost::CommandLineAPIHost):
(WebCore::CommandLineAPIHost::disconnect):
(WebCore::CommandLineAPIHost::databaseIdImpl):
* inspector/CommandLineAPIHost.h:
(WebCore::CommandLineAPIHost::init):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
* inspector/InspectorDatabaseAgent.cpp:
* inspector/InspectorDatabaseAgent.h:
* inspector/InspectorDatabaseInstrumentation.h:
(WebCore::InspectorInstrumentation::didOpenDatabase):
* inspector/InspectorDatabaseResource.cpp:
* inspector/InspectorDatabaseResource.h:
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didCommitLoadImpl):
(WebCore::InspectorInstrumentation::didOpenDatabaseImpl):
* inspector/InspectorInstrumentation.h:
* inspector/InstrumentingAgents.cpp:
(WebCore::InstrumentingAgents::InstrumentingAgents):
(WebCore::InstrumentingAgents::reset):
* inspector/InstrumentingAgents.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
* loader/EmptyClients.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::stopLoading):
* page/ChromeClient.h:
* platform/FeatureCounterKeys.h:
Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:
* Storage/WebDatabaseManager.mm:
(databasesDirectoryPath):
* Storage/WebDatabaseManagerClient.h:
* Storage/WebDatabaseManagerClient.mm:
* Storage/WebDatabaseManagerInternal.h:
* Storage/WebDatabaseManagerPrivate.h:
* Storage/WebDatabaseQuotaManager.mm:
(-[WebDatabaseQuotaManager usage]):
(-[WebDatabaseQuotaManager quota]):
(-[WebDatabaseQuotaManager setQuota:]):
* 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:]):
(-[WebView _preferencesChanged:]):
Source/WebKit/win:
* ForEachCoClass.h:
* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::exceededDatabaseQuota):
* WebCoreSupport/WebChromeClient.h:
* WebDatabaseManager.cpp:
(WebKitInitializeWebDatabasesIfNecessary):
* WebDatabaseManager.h:
* WebSecurityOrigin.cpp:
(WebSecurityOrigin::usage):
(WebSecurityOrigin::quota):
(WebSecurityOrigin::setQuota):
* WebView.cpp:
(WebView::initWithFrame):
(WebView::notifyPreferencesChanged):
Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:
* Shared/OriginAndDatabases.cpp:
* Shared/OriginAndDatabases.h:
* Shared/WebCoreArgumentCoders.cpp:
* UIProcess/API/C/WKContext.cpp:
(WKContextGetDatabaseManager):
* UIProcess/API/C/WKDatabaseManager.cpp:
(WKDatabaseManagerGetTypeID):
(WKDatabaseManagerGetOriginKey):
(WKDatabaseManagerGetOriginQuotaKey):
(WKDatabaseManagerGetOriginUsageKey):
(WKDatabaseManagerGetDatabaseDetailsKey):
(WKDatabaseManagerGetDatabaseDetailsNameKey):
(WKDatabaseManagerGetDatabaseDetailsDisplayNameKey):
(WKDatabaseManagerGetDatabaseDetailsExpectedUsageKey):
(WKDatabaseManagerGetDatabaseDetailsCurrentUsageKey):
(WKDatabaseManagerGetDatabaseDetailsCreationTimeKey):
(WKDatabaseManagerGetDatabaseDetailsModificationTimeKey):
(WKDatabaseManagerSetClient):
(WKDatabaseManagerGetDatabasesByOrigin):
(WKDatabaseManagerGetDatabaseOrigins):
(WKDatabaseManagerDeleteDatabasesWithNameForOrigin):
(WKDatabaseManagerDeleteDatabasesForOrigin):
(WKDatabaseManagerDeleteAllDatabases):
(WKDatabaseManagerSetQuotaForOrigin):
* UIProcess/API/efl/EwkView.cpp:
(EwkView::informDatabaseQuotaReached):
* UIProcess/WebDatabaseManagerProxy.cpp:
* UIProcess/WebDatabaseManagerProxy.h:
* UIProcess/WebDatabaseManagerProxy.messages.in:
* UIProcess/WebProcessPool.cpp:
* UIProcess/efl/PageUIClientEfl.cpp:
(WebKit::PageUIClientEfl::PageUIClientEfl):
(WebKit::PageUIClientEfl::exceededDatabaseQuota):
* UIProcess/efl/PageUIClientEfl.h:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::clearAllDatabases):
(WebKit::InjectedBundle::setDatabaseQuota):
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::exceededDatabaseQuota):
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
* WebProcess/WebCoreSupport/WebDatabaseManager.h:
* WebProcess/WebCoreSupport/WebDatabaseManager.messages.in:
* WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp:
* WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
Source/WTF:
* wtf/FeatureDefines.h:
Tools:
* Scripts/webkitperl/FeatureList.pm:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@178575
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmakeconfig.h.cmake:
+
2015-01-11 Sam Weinig <sam@webkit.org>
Remove support for SharedWorkers
${JAVASCRIPTCORE_DIR}/inspector/protocol/DOM.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/DOMDebugger.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/DOMStorage.json
+ ${JAVASCRIPTCORE_DIR}/inspector/protocol/Database.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/Debugger.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/GenericTypes.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/Inspector.json
${JAVASCRIPTCORE_DIR}/inspector/protocol/Worker.json
)
-if (ENABLE_SQL_DATABASE)
- list(APPEND JavaScriptCore_INSPECTOR_DOMAINS
- ${JAVASCRIPTCORE_DIR}/inspector/protocol/Database.json
- )
-endif ()
-
if (ENABLE_INDEXED_DATABASE)
list(APPEND JavaScriptCore_INSPECTOR_DOMAINS
${JAVASCRIPTCORE_DIR}/inspector/protocol/IndexedDB.json
+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * CMakeLists.txt:
+ * Configurations/FeatureDefines.xcconfig:
+ * DerivedSources.make:
+ * inspector/protocol/Database.json:
+
2015-01-14 Alexey Proskuryakov <ap@apple.com>
Web Inspector and regular console use different source code locations for messages
ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
-ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
ENABLE_SUBTLE_CRYPTO[sdk=iphone*] = ENABLE_SUBTLE_CRYPTO;
ENABLE_SUBTLE_CRYPTO[sdk=macosx*] = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
$(JavaScriptCore)/inspector/protocol/DOM.json \
$(JavaScriptCore)/inspector/protocol/DOMDebugger.json \
$(JavaScriptCore)/inspector/protocol/DOMStorage.json \
+ $(JavaScriptCore)/inspector/protocol/Database.json \
$(JavaScriptCore)/inspector/protocol/Debugger.json \
$(JavaScriptCore)/inspector/protocol/GenericTypes.json \
$(JavaScriptCore)/inspector/protocol/Inspector.json \
$(JavaScriptCore)/inspector/protocol/Worker.json \
#
-ifeq ($(findstring ENABLE_SQL_DATABASE,$(FEATURE_DEFINES)), ENABLE_SQL_DATABASE)
- INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(JavaScriptCore)/inspector/protocol/Database.json
-endif
-
ifeq ($(findstring ENABLE_INDEXED_DATABASE,$(FEATURE_DEFINES)), ENABLE_INDEXED_DATABASE)
INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(JavaScriptCore)/inspector/protocol/IndexedDB.json
endif
{
"domain": "Database",
- "featureGuard": "ENABLE(SQL_DATABASE)",
"availability": "web",
"types": [
{
+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * wtf/FeatureDefines.h:
+
2015-01-14 Csaba Osztrogonác <ossy@webkit.org>
Unreviewed fix after r163330.
#define ENABLE_SPELLCHECK 0
#endif
-#if !defined(ENABLE_SQL_DATABASE)
-#define ENABLE_SQL_DATABASE 1
-#endif
-
#if !defined(ENABLE_SVG_FONTS)
#define ENABLE_SVG_FONTS 1
#endif
+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Modules/webdatabase/AbstractDatabaseServer.h:
+ * Modules/webdatabase/ChangeVersionData.h:
+ * Modules/webdatabase/ChangeVersionWrapper.cpp:
+ * Modules/webdatabase/ChangeVersionWrapper.h:
+ * Modules/webdatabase/DOMWindowWebDatabase.cpp:
+ * Modules/webdatabase/DOMWindowWebDatabase.h:
+ * Modules/webdatabase/DOMWindowWebDatabase.idl:
+ * Modules/webdatabase/Database.cpp:
+ * Modules/webdatabase/Database.h:
+ * Modules/webdatabase/Database.idl:
+ * Modules/webdatabase/DatabaseBackend.cpp:
+ * Modules/webdatabase/DatabaseBackend.h:
+ * Modules/webdatabase/DatabaseBackendBase.cpp:
+ * Modules/webdatabase/DatabaseBackendBase.h:
+ * Modules/webdatabase/DatabaseBasicTypes.h:
+ * Modules/webdatabase/DatabaseCallback.h:
+ * Modules/webdatabase/DatabaseCallback.idl:
+ * Modules/webdatabase/DatabaseContext.cpp:
+ * Modules/webdatabase/DatabaseContext.h:
+ * Modules/webdatabase/DatabaseDetails.h:
+ * Modules/webdatabase/DatabaseError.h:
+ * Modules/webdatabase/DatabaseManager.cpp:
+ * Modules/webdatabase/DatabaseManager.h:
+ * Modules/webdatabase/DatabaseManagerClient.h:
+ * Modules/webdatabase/DatabaseServer.cpp:
+ * Modules/webdatabase/DatabaseServer.h:
+ * Modules/webdatabase/DatabaseTask.cpp:
+ * Modules/webdatabase/DatabaseTask.h:
+ * Modules/webdatabase/DatabaseThread.cpp:
+ * Modules/webdatabase/DatabaseThread.h:
+ * Modules/webdatabase/DatabaseTracker.cpp:
+ * Modules/webdatabase/DatabaseTracker.h:
+ * Modules/webdatabase/OriginLock.cpp:
+ * Modules/webdatabase/OriginLock.h:
+ * Modules/webdatabase/SQLCallbackWrapper.h:
+ * Modules/webdatabase/SQLError.h:
+ * Modules/webdatabase/SQLError.idl:
+ * Modules/webdatabase/SQLException.cpp:
+ * Modules/webdatabase/SQLException.h:
+ * Modules/webdatabase/SQLException.idl:
+ * Modules/webdatabase/SQLResultSet.cpp:
+ * Modules/webdatabase/SQLResultSet.h:
+ * Modules/webdatabase/SQLResultSet.idl:
+ * Modules/webdatabase/SQLResultSetRowList.cpp:
+ * Modules/webdatabase/SQLResultSetRowList.h:
+ * Modules/webdatabase/SQLResultSetRowList.idl:
+ * Modules/webdatabase/SQLStatement.cpp:
+ * Modules/webdatabase/SQLStatement.h:
+ * Modules/webdatabase/SQLStatementBackend.cpp:
+ * Modules/webdatabase/SQLStatementBackend.h:
+ * Modules/webdatabase/SQLStatementCallback.h:
+ * Modules/webdatabase/SQLStatementCallback.idl:
+ * Modules/webdatabase/SQLStatementErrorCallback.h:
+ * Modules/webdatabase/SQLStatementErrorCallback.idl:
+ * Modules/webdatabase/SQLTransaction.cpp:
+ * Modules/webdatabase/SQLTransaction.h:
+ * Modules/webdatabase/SQLTransaction.idl:
+ * Modules/webdatabase/SQLTransactionBackend.cpp:
+ * Modules/webdatabase/SQLTransactionBackend.h:
+ * Modules/webdatabase/SQLTransactionCallback.h:
+ * Modules/webdatabase/SQLTransactionCallback.idl:
+ * Modules/webdatabase/SQLTransactionClient.cpp:
+ * Modules/webdatabase/SQLTransactionClient.h:
+ * Modules/webdatabase/SQLTransactionCoordinator.cpp:
+ * Modules/webdatabase/SQLTransactionCoordinator.h:
+ * Modules/webdatabase/SQLTransactionErrorCallback.h:
+ * Modules/webdatabase/SQLTransactionErrorCallback.idl:
+ * Modules/webdatabase/SQLTransactionState.h:
+ * Modules/webdatabase/SQLTransactionStateMachine.cpp:
+ * Modules/webdatabase/SQLTransactionStateMachine.h:
+ * bindings/js/JSCommandLineAPIHostCustom.cpp:
+ (WebCore::JSCommandLineAPIHost::databaseId):
+ * bindings/js/JSCustomSQLStatementErrorCallback.cpp:
+ * bindings/js/JSExceptionBase.cpp:
+ (WebCore::toExceptionBase):
+ * bindings/js/JSSQLResultSetRowListCustom.cpp:
+ * bindings/js/JSSQLTransactionCustom.cpp:
+ * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
+ (webkit_dom_test_callback_finalize):
+ (webkit_dom_test_callback_constructor):
+ (webkit_dom_test_callback_callback_with_no_param):
+ (webkit_dom_test_callback_callback_with_array_param):
+ (webkit_dom_test_callback_callback_with_serialized_script_value_param):
+ (webkit_dom_test_callback_callback_with_non_bool_return_type):
+ (webkit_dom_test_callback_callback_with_string_list):
+ (webkit_dom_test_callback_callback_with_boolean):
+ (webkit_dom_test_callback_callback_requires_this_to_pass):
+ * bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h:
+ * bindings/scripts/test/JS/JSTestCallback.cpp:
+ * bindings/scripts/test/JS/JSTestCallback.h:
+ * bindings/scripts/test/ObjC/DOMTestCallback.mm:
+ * bindings/scripts/test/TestCallback.idl:
+ * dom/DOMExceptions.in:
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::setDatabaseContext):
+ * dom/ScriptExecutionContext.h:
+ * history/PageCache.cpp:
+ (WebCore::logCanCacheFrameDecision):
+ (WebCore::PageCache::canCachePageContainingThisFrame):
+ * inspector/CommandLineAPIHost.cpp:
+ (WebCore::CommandLineAPIHost::CommandLineAPIHost):
+ (WebCore::CommandLineAPIHost::disconnect):
+ (WebCore::CommandLineAPIHost::databaseIdImpl):
+ * inspector/CommandLineAPIHost.h:
+ (WebCore::CommandLineAPIHost::init):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ * inspector/InspectorDatabaseAgent.cpp:
+ * inspector/InspectorDatabaseAgent.h:
+ * inspector/InspectorDatabaseInstrumentation.h:
+ (WebCore::InspectorInstrumentation::didOpenDatabase):
+ * inspector/InspectorDatabaseResource.cpp:
+ * inspector/InspectorDatabaseResource.h:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+ (WebCore::InspectorInstrumentation::didOpenDatabaseImpl):
+ * inspector/InspectorInstrumentation.h:
+ * inspector/InstrumentingAgents.cpp:
+ (WebCore::InstrumentingAgents::InstrumentingAgents):
+ (WebCore::InstrumentingAgents::reset):
+ * inspector/InstrumentingAgents.h:
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::WorkerInspectorController):
+ * loader/EmptyClients.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::stopLoading):
+ * page/ChromeClient.h:
+ * platform/FeatureCounterKeys.h:
+
2015-01-15 Zalan Bujtas <zalan@apple.com>
Element appears correctly but does not receive event with a large translation.
ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
-ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
ENABLE_SUBTLE_CRYPTO[sdk=iphone*] = ENABLE_SUBTLE_CRYPTO;
ENABLE_SUBTLE_CRYPTO[sdk=macosx*] = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
#ifndef AbstractDatabaseServer_h
#define AbstractDatabaseServer_h
-#if ENABLE(SQL_DATABASE)
-
#include "DatabaseBasicTypes.h"
#include "DatabaseDetails.h"
#include "DatabaseError.h"
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // AbstractDatabaseServer_h
#ifndef ChangeVersionData_h
#define ChangeVersionData_h
-#if ENABLE(SQL_DATABASE)
-
#include <wtf/text/WTFString.h>
namespace WebCore {
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // ChangeVersionData_h
#include "config.h"
#include "ChangeVersionWrapper.h"
-#if ENABLE(SQL_DATABASE)
-
#include "Database.h"
#include "SQLError.h"
#include <wtf/PassRefPtr.h>
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef ChangeVersionWrapper_h
#define ChangeVersionWrapper_h
-#if ENABLE(SQL_DATABASE)
-
#include "SQLTransactionBackend.h"
#include <wtf/Forward.h>
} // namespace WebCore
-#endif
-
#endif // ChangeVersionWrapper_h
*/
#include "config.h"
-
-#if ENABLE(SQL_DATABASE)
-
#include "DOMWindowWebDatabase.h"
#include "DOMWindow.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef DOMWindowWebDatabase_h
#define DOMWindowWebDatabase_h
-#if ENABLE(SQL_DATABASE)
#include "ExceptionCode.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // DOMWindowWebDatabase_h
*/
[
- Conditional=SQL_DATABASE,
] partial interface DOMWindow {
[RaisesException] Database openDatabase(DOMString name, DOMString version, DOMString displayName, unsigned long estimatedSize, optional DatabaseCallback creationCallback);
};
#include "config.h"
#include "Database.h"
-#if ENABLE(SQL_DATABASE)
-
#include "ChangeVersionData.h"
#include "ChangeVersionWrapper.h"
#include "DatabaseCallback.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef Database_h
#define Database_h
-#if ENABLE(SQL_DATABASE)
-
#include "DatabaseBackend.h"
#include "DatabaseBasicTypes.h"
#include "DatabaseError.h"
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // Database_h
[
NoInterfaceObject,
- Conditional=SQL_DATABASE,
] interface Database {
readonly attribute DOMString version;
void changeVersion(DOMString oldVersion, DOMString newVersion, optional SQLTransactionCallback callback, optional SQLTransactionErrorCallback errorCallback, optional VoidCallback successCallback);
#include "config.h"
#include "DatabaseBackend.h"
-#if ENABLE(SQL_DATABASE)
-
#include "ChangeVersionData.h"
#include "ChangeVersionWrapper.h"
#include "Database.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef DatabaseBackend_h
#define DatabaseBackend_h
-#if ENABLE(SQL_DATABASE)
-
#include "DatabaseBackendBase.h"
#include <wtf/Deque.h>
#include <wtf/text/WTFString.h>
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // DatabaseBackend_h
#include "config.h"
#include "DatabaseBackendBase.h"
-#if ENABLE(SQL_DATABASE)
-
#include "Database.h"
#include "DatabaseAuthorizer.h"
#include "DatabaseContext.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef DatabaseBackendBase_h
#define DatabaseBackendBase_h
-#if ENABLE(SQL_DATABASE)
-
#include "DatabaseBasicTypes.h"
#include "DatabaseDetails.h"
#include "DatabaseError.h"
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // DatabaseBackendBase_h
#ifndef DatabaseBasicTypes_h
#define DatabaseBasicTypes_h
-#if ENABLE(SQL_DATABASE)
-
namespace WebCore {
typedef int DatabaseGuid;
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // DatabaseBasicTypes_h
#ifndef DatabaseCallback_h
#define DatabaseCallback_h
-#if ENABLE(SQL_DATABASE)
-
#include <wtf/ThreadSafeRefCounted.h>
namespace WebCore {
}
-#endif
-
#endif // DatabaseCallback_h
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SQL_DATABASE,
-] callback interface DatabaseCallback {
+callback interface DatabaseCallback {
boolean handleEvent(Database database);
};
#include "config.h"
#include "DatabaseContext.h"
-#if ENABLE(SQL_DATABASE)
-
#include "Chrome.h"
#include "ChromeClient.h"
#include "Database.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef DatabaseContext_h
#define DatabaseContext_h
-#if ENABLE(SQL_DATABASE)
-
#include "ActiveDOMObject.h"
#include <wtf/RefPtr.h>
#include <wtf/ThreadSafeRefCounted.h>
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // DatabaseContext_h
#ifndef DatabaseDetails_h
#define DatabaseDetails_h
-#if ENABLE(SQL_DATABASE)
-
#include <thread>
#include <wtf/text/WTFString.h>
} // namespace WebCore
-#endif
-
#endif // DatabaseDetails_h
#ifndef DatabaseError_h
#define DatabaseError_h
-#if ENABLE(SQL_DATABASE)
-
namespace WebCore {
enum class DatabaseError {
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // DatabaseError_h
#include "config.h"
#include "DatabaseManager.h"
-#if ENABLE(SQL_DATABASE)
-
#include "AbstractDatabaseServer.h"
#include "Database.h"
#include "DatabaseBackend.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef DatabaseManager_h
#define DatabaseManager_h
-#if ENABLE(SQL_DATABASE)
-
#include "DatabaseBasicTypes.h"
#include "DatabaseDetails.h"
#include "DatabaseError.h"
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // DatabaseManager_h
#ifndef DatabaseManagerClient_h
#define DatabaseManagerClient_h
-#if ENABLE(SQL_DATABASE)
-
#include <wtf/Forward.h>
namespace WebCore {
} // namespace WebCore
-#endif
-
#endif // DatabaseManagerClient_h
#include "config.h"
#include "DatabaseServer.h"
-#if ENABLE(SQL_DATABASE)
-
#include "Database.h"
#include "DatabaseBackend.h"
#include "DatabaseContext.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef DatabaseServer_h
#define DatabaseServer_h
-#if ENABLE(SQL_DATABASE)
-
#include "AbstractDatabaseServer.h"
namespace WebCore {
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // DatabaseServer_h
#include "config.h"
#include "DatabaseTask.h"
-#if ENABLE(SQL_DATABASE)
-
#include "Database.h"
#include "DatabaseBackend.h"
#include "Logging.h"
#endif
} // namespace WebCore
-
-#endif
#ifndef DatabaseTask_h
#define DatabaseTask_h
-#if ENABLE(SQL_DATABASE)
-
#include "DatabaseBackend.h"
#include "DatabaseBasicTypes.h"
#include "DatabaseError.h"
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // DatabaseTask_h
#include "config.h"
#include "DatabaseThread.h"
-#if ENABLE(SQL_DATABASE)
-
#include "Database.h"
#include "DatabaseTask.h"
#include "Logging.h"
m_queue.removeIf(predicate);
}
} // namespace WebCore
-#endif
#ifndef DatabaseThread_h
#define DatabaseThread_h
-#if ENABLE(SQL_DATABASE)
-
#include <memory>
#include <wtf/Deque.h>
#include <wtf/HashMap.h>
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
#endif // DatabaseThread_h
#include "config.h"
#include "DatabaseTracker.h"
-#if ENABLE(SQL_DATABASE)
-
#include "Chrome.h"
#include "ChromeClient.h"
#include "Database.h"
} // namespace WebCore
-#endif
#ifndef DatabaseTracker_h
#define DatabaseTracker_h
-#if ENABLE(SQL_DATABASE)
-
#include "DatabaseDetails.h"
#include "DatabaseError.h"
#include "SQLiteDatabase.h"
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // DatabaseTracker_h
#include "config.h"
#include "OriginLock.h"
-#if ENABLE(SQL_DATABASE)
-
#include "FileSystem.h"
namespace WebCore {
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef OriginLock_h
#define OriginLock_h
-#if ENABLE(SQL_DATABASE)
-
#include "FileSystem.h"
#include <wtf/ThreadSafeRefCounted.h>
#include <wtf/ThreadingPrimitives.h>
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // OriginLock_h
#ifndef SQLCallbackWrapper_h
#define SQLCallbackWrapper_h
-#if ENABLE(SQL_DATABASE)
-
#include "ScriptExecutionContext.h"
#include <wtf/ThreadingPrimitives.h>
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // SQLCallbackWrapper_h
#ifndef SQLError_h
#define SQLError_h
-#if ENABLE(SQL_DATABASE)
-
#include <wtf/ThreadSafeRefCounted.h>
#include <wtf/text/WTFString.h>
}
-#endif
-
#endif // SQLError_h
[
NoInterfaceObject,
- Conditional=SQL_DATABASE,
ImplementationLacksVTable
] interface SQLError {
readonly attribute unsigned long code;
*/
#include "config.h"
-
-#if ENABLE(SQL_DATABASE)
#include "SQLException.h"
#include "ExceptionCodeDescription.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef SQLException_h
#define SQLException_h
-#if ENABLE(SQL_DATABASE)
-
#include "ExceptionBase.h"
namespace WebCore {
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // SQLException_h
*/
[
- Conditional=SQL_DATABASE,
DoNotCheckConstants,
ImplementationLacksVTable
] exception SQLException {
#include "config.h"
#include "SQLResultSet.h"
-#if ENABLE(SQL_DATABASE)
-
#include "ExceptionCode.h"
namespace WebCore {
}
}
-
-#endif
#ifndef SQLResultSet_h
#define SQLResultSet_h
-#if ENABLE(SQL_DATABASE)
-
#include "DatabaseBasicTypes.h"
#include "SQLResultSetRowList.h"
#include <wtf/ThreadSafeRefCounted.h>
} // namespace WebCore
-#endif
-
#endif // SQLResultSet_h
[
NoInterfaceObject,
- Conditional=SQL_DATABASE,
ImplementationLacksVTable
] interface SQLResultSet {
readonly attribute SQLResultSetRowList rows;
#include "config.h"
#include "SQLResultSetRowList.h"
-#if ENABLE(SQL_DATABASE)
-
namespace WebCore {
unsigned SQLResultSetRowList::length() const
}
}
-
-#endif
#ifndef SQLResultSetRowList_h
#define SQLResultSetRowList_h
-#if ENABLE(SQL_DATABASE)
-
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include "SQLValue.h"
}
#endif
-
-#endif
[
NoInterfaceObject,
- Conditional=SQL_DATABASE,
ImplementationLacksVTable,
] interface SQLResultSetRowList {
readonly attribute unsigned long length;
#include "config.h"
#include "SQLStatement.h"
-#if ENABLE(SQL_DATABASE)
-
#include "AbstractDatabaseServer.h"
#include "Database.h"
#include "DatabaseManager.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef SQLStatement_h
#define SQLStatement_h
-#if ENABLE(SQL_DATABASE)
-
#include "SQLCallbackWrapper.h"
#include "SQLResultSet.h"
#include "SQLValue.h"
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // SQLStatement_h
#include "config.h"
#include "SQLStatementBackend.h"
-#if ENABLE(SQL_DATABASE)
-
#include "DatabaseBackend.h"
#include "Logging.h"
#include "SQLError.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef SQLStatementBackend_h
#define SQLStatementBackend_h
-#if ENABLE(SQL_DATABASE)
-
#include "SQLValue.h"
#include <wtf/Forward.h>
#include <wtf/Vector.h>
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // SQLStatementBackend_h
#ifndef SQLStatementCallback_h
#define SQLStatementCallback_h
-#if ENABLE(SQL_DATABASE)
-
#include <wtf/ThreadSafeRefCounted.h>
namespace WebCore {
}
-#endif
-
#endif // SQLStatementErrorCallback_h
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SQL_DATABASE,
-] callback interface SQLStatementCallback {
+callback interface SQLStatementCallback {
boolean handleEvent(SQLTransaction transaction, SQLResultSet resultSet);
};
#ifndef SQLStatementErrorCallback_h
#define SQLStatementErrorCallback_h
-#if ENABLE(SQL_DATABASE)
-
#include <wtf/ThreadSafeRefCounted.h>
namespace WebCore {
}
-#endif
-
#endif // SQLStatementErrorCallback_h
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SQL_DATABASE,
-] callback interface SQLStatementErrorCallback {
+callback interface SQLStatementErrorCallback {
[Custom] boolean handleEvent(SQLTransaction transaction, SQLError error);
};
#include "config.h"
#include "SQLTransaction.h"
-#if ENABLE(SQL_DATABASE)
-
#include "Database.h"
#include "DatabaseAuthorizer.h"
#include "DatabaseContext.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef SQLTransaction_h
#define SQLTransaction_h
-#if ENABLE(SQL_DATABASE)
-
#include "SQLCallbackWrapper.h"
#include "SQLStatement.h"
#include "SQLTransactionStateMachine.h"
} // namespace WebCore
-#endif
-
#endif // SQLTransaction_h
[
NoInterfaceObject,
- Conditional=SQL_DATABASE,
SkipVTableValidation,
] interface SQLTransaction {
[Custom] void executeSql(DOMString sqlStatement,
#include "config.h"
#include "SQLTransactionBackend.h"
-#if ENABLE(SQL_DATABASE)
-
#include "Database.h" // FIXME: Should only be used in the frontend.
#include "DatabaseAuthorizer.h"
#include "DatabaseBackend.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef SQLTransactionBackend_h
#define SQLTransactionBackend_h
-#if ENABLE(SQL_DATABASE)
-
#include "DatabaseBasicTypes.h"
#include "SQLTransactionStateMachine.h"
#include <memory>
} // namespace WebCore
-#endif
-
#endif // SQLTransactionBackend_h
#ifndef SQLTransactionCallback_h
#define SQLTransactionCallback_h
-#if ENABLE(SQL_DATABASE)
-
#include <wtf/ThreadSafeRefCounted.h>
namespace WebCore {
}
-#endif
-
#endif // SQLTransactionCallback_h
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SQL_DATABASE,
-] callback interface SQLTransactionCallback {
+callback interface SQLTransactionCallback {
boolean handleEvent(SQLTransaction transaction);
};
#include "config.h"
#include "SQLTransactionClient.h"
-#if ENABLE(SQL_DATABASE)
-
#include "DatabaseBackendBase.h"
#include "DatabaseContext.h"
#include "DatabaseManager.h"
}
}
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef SQLTransactionClient_h
#define SQLTransactionClient_h
-#if ENABLE(SQL_DATABASE)
-
#include <wtf/FastMalloc.h>
#include <wtf/Noncopyable.h>
}
-#endif // ENABLE(SQL_DATABASE)
-
#endif // SQLTransactionClient_h
#include "config.h"
#include "SQLTransactionCoordinator.h"
-#if ENABLE(SQL_DATABASE)
-
#include "Database.h"
#include "SQLTransactionBackend.h"
#include "SecurityOrigin.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef SQLTransactionCoordinator_h
#define SQLTransactionCoordinator_h
-#if ENABLE(SQL_DATABASE)
-
#include <wtf/Deque.h>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // SQLTransactionCoordinator_h
#ifndef SQLTransactionErrorCallback_h
#define SQLTransactionErrorCallback_h
-#if ENABLE(SQL_DATABASE)
-
#include <wtf/ThreadSafeRefCounted.h>
namespace WebCore {
}
-#endif
-
#endif // SQLTransactionErrorCallback_h
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SQL_DATABASE,
-] callback interface SQLTransactionErrorCallback {
+callback interface SQLTransactionErrorCallback {
boolean handleEvent(SQLError error);
};
#ifndef SQLTransactionState_h
#define SQLTransactionState_h
-#if ENABLE(SQL_DATABASE)
-
namespace WebCore {
enum class SQLTransactionState {
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // SQLTransactionState_h
#include "config.h"
#include "SQLTransactionStateMachine.h"
-#if ENABLE(SQL_DATABASE)
-
#include "Logging.h"
#include <wtf/Assertions.h>
#endif
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef SQLTransactionStateMachine_h
#define SQLTransactionStateMachine_h
-#if ENABLE(SQL_DATABASE)
-
#include "SQLTransactionState.h"
#include <wtf/ThreadSafeRefCounted.h>
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
-
#endif // SQLTransactionStateMachine_h
#include "JSCommandLineAPIHost.h"
#include "CommandLineAPIHost.h"
+#include "Database.h"
#include "InspectorDOMAgent.h"
+#include "JSDatabase.h"
#include "JSEventListener.h"
#include "JSNode.h"
#include "JSStorage.h"
#include <runtime/JSLock.h>
#include <runtime/ObjectConstructor.h>
-#if ENABLE(SQL_DATABASE)
-#include "Database.h"
-#include "JSDatabase.h"
-#endif
using namespace JSC;
if (exec->argumentCount() < 1)
return jsUndefined();
-#if ENABLE(SQL_DATABASE)
Database* database = JSDatabase::toWrapped(exec->uncheckedArgument(0));
if (database)
return jsStringWithCache(exec, impl().databaseIdImpl(database));
-#endif
return jsUndefined();
}
*/
#include "config.h"
-
-#if ENABLE(SQL_DATABASE)
-
#include "JSSQLStatementErrorCallback.h"
#include "JSSQLError.h"
}
}
-
-#endif // ENABLE(SQL_DATABASE)
#include "JSDOMCoreException.h"
#include "JSEventException.h"
#include "JSRangeException.h"
+#include "JSSQLException.h"
#include "JSSVGException.h"
#include "JSXMLHttpRequestException.h"
#include "JSXPathException.h"
-#if ENABLE(SQL_DATABASE)
#include "SQLException.h"
-#include "JSSQLException.h"
-#endif
namespace WebCore {
return reinterpret_cast<ExceptionBase*>(svgException);
if (XPathException* pathException = JSXPathException::toWrapped(value))
return reinterpret_cast<ExceptionBase*>(pathException);
-#if ENABLE(SQL_DATABASE)
if (SQLException* pathException = JSSQLException::toWrapped(value))
return reinterpret_cast<ExceptionBase*>(pathException);
-#endif
return 0;
}
#include "config.h"
-#if ENABLE(SQL_DATABASE)
-
#include "JSSQLResultSetRowList.h"
-
#include "ExceptionCode.h"
#include "JSDOMBinding.h"
#include "SQLValue.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#include "config.h"
-#if ENABLE(SQL_DATABASE)
-
#include "JSSQLTransaction.h"
-
#include "DOMWindow.h"
#include "ExceptionCode.h"
#include "JSSQLStatementCallback.h"
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
#define WEBKIT_DOM_TEST_CALLBACK_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_CALLBACK, WebKitDOMTestCallbackPrivate)
typedef struct _WebKitDOMTestCallbackPrivate {
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
RefPtr<WebCore::TestCallback> coreObject;
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(SPEECH_SYNTHESIS)
} WebKitDOMTestCallbackPrivate;
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
namespace WebKit {
} // namespace WebKit
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(SPEECH_SYNTHESIS)
G_DEFINE_TYPE(WebKitDOMTestCallback, webkit_dom_test_callback, WEBKIT_DOM_TYPE_OBJECT)
static void webkit_dom_test_callback_finalize(GObject* object)
{
WebKitDOMTestCallbackPrivate* priv = WEBKIT_DOM_TEST_CALLBACK_GET_PRIVATE(object);
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
WebKit::DOMObjectCache::forget(priv->coreObject.get());
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(SPEECH_SYNTHESIS)
priv->~WebKitDOMTestCallbackPrivate();
G_OBJECT_CLASS(webkit_dom_test_callback_parent_class)->finalize(object);
}
static GObject* webkit_dom_test_callback_constructor(GType type, guint constructPropertiesCount, GObjectConstructParam* constructProperties)
{
GObject* object = G_OBJECT_CLASS(webkit_dom_test_callback_parent_class)->constructor(type, constructPropertiesCount, constructProperties);
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
WebKitDOMTestCallbackPrivate* priv = WEBKIT_DOM_TEST_CALLBACK_GET_PRIVATE(object);
priv->coreObject = static_cast<WebCore::TestCallback*>(WEBKIT_DOM_OBJECT(object)->coreObject);
WebKit::DOMObjectCache::put(priv->coreObject.get(), object);
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(SPEECH_SYNTHESIS)
return object;
}
gboolean webkit_dom_test_callback_callback_with_no_param(WebKitDOMTestCallback* self)
{
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
WebCore::TestCallback* item = WebKit::core(self);
return result;
#else
UNUSED_PARAM(self);
- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
return static_cast<gboolean>(0);
-#endif /* ENABLE(SQL_DATABASE) */
+#endif /* ENABLE(SPEECH_SYNTHESIS) */
}
gboolean webkit_dom_test_callback_callback_with_array_param(WebKitDOMTestCallback* self, WebKitDOMFloat32Array* arrayParam)
{
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
g_return_val_if_fail(WEBKIT_DOM_IS_FLOAT32ARRAY(arrayParam), FALSE);
#else
UNUSED_PARAM(self);
UNUSED_PARAM(arrayParam);
- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
return static_cast<gboolean>(0);
-#endif /* ENABLE(SQL_DATABASE) */
+#endif /* ENABLE(SPEECH_SYNTHESIS) */
}
gboolean webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, const gchar* srzParam, const gchar* strArg)
{
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
g_return_val_if_fail(srzParam, FALSE);
UNUSED_PARAM(self);
UNUSED_PARAM(srzParam);
UNUSED_PARAM(strArg);
- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
return static_cast<gboolean>(0);
-#endif /* ENABLE(SQL_DATABASE) */
+#endif /* ENABLE(SPEECH_SYNTHESIS) */
}
glong webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, const gchar* strArg)
{
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), 0);
g_return_val_if_fail(strArg, 0);
#else
UNUSED_PARAM(self);
UNUSED_PARAM(strArg);
- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
return static_cast<glong>(0);
-#endif /* ENABLE(SQL_DATABASE) */
+#endif /* ENABLE(SPEECH_SYNTHESIS) */
}
gboolean webkit_dom_test_callback_callback_with_string_list(WebKitDOMTestCallback* self, WebKitDOMDOMStringList* listParam)
{
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
g_return_val_if_fail(WEBKIT_DOM_IS_DOM_STRING_LIST(listParam), FALSE);
#else
UNUSED_PARAM(self);
UNUSED_PARAM(listParam);
- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
return static_cast<gboolean>(0);
-#endif /* ENABLE(SQL_DATABASE) */
+#endif /* ENABLE(SPEECH_SYNTHESIS) */
}
gboolean webkit_dom_test_callback_callback_with_boolean(WebKitDOMTestCallback* self, gboolean boolParam)
{
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
WebCore::TestCallback* item = WebKit::core(self);
#else
UNUSED_PARAM(self);
UNUSED_PARAM(boolParam);
- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
return static_cast<gboolean>(0);
-#endif /* ENABLE(SQL_DATABASE) */
+#endif /* ENABLE(SPEECH_SYNTHESIS) */
}
gboolean webkit_dom_test_callback_callback_requires_this_to_pass(WebKitDOMTestCallback* self, glong longParam, WebKitDOMTestNode* testNodeParam)
{
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_NODE(testNodeParam), FALSE);
UNUSED_PARAM(self);
UNUSED_PARAM(longParam);
UNUSED_PARAM(testNodeParam);
- WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Speech Synthesis")
return static_cast<gboolean>(0);
-#endif /* ENABLE(SQL_DATABASE) */
+#endif /* ENABLE(SPEECH_SYNTHESIS) */
}
#include "TestCallback.h"
#include <webkitdom/WebKitDOMTestCallback.h>
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
namespace WebKit {
WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback*);
WebCore::TestCallback* core(WebKitDOMTestCallback*);
} // namespace WebKit
-#endif /* ENABLE(SQL_DATABASE) */
+#endif /* ENABLE(SPEECH_SYNTHESIS) */
#endif /* WebKitDOMTestCallbackPrivate_h */
#include "config.h"
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
#include "JSTestCallback.h"
}
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(SPEECH_SYNTHESIS)
#ifndef JSTestCallback_h
#define JSTestCallback_h
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
#include "ActiveDOMCallback.h"
#include "JSCallbackData.h"
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(SPEECH_SYNTHESIS)
#endif
#import "config.h"
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
#import "DOMInternal.h"
return [wrapper autorelease];
}
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(SPEECH_SYNTHESIS)
// This IDL file is for testing the bindings code generator with a callback
// interface and for tracking changes in its ouput.
[
- Conditional=SQL_DATABASE,
+ Conditional=SPEECH_SYNTHESIS,
] callback interface TestCallback {
boolean callbackWithNoParam();
boolean callbackWithArrayParam(Float32Array arrayParam);
EventException
FileException
RangeException
-SQLException conditional=SQL_DATABASE
+SQLException
SVGException
XMLHttpRequestException
XPathException
#include "CachedScript.h"
#include "DOMTimer.h"
+#include "DatabaseContext.h"
#include "Document.h"
#include "ErrorEvent.h"
#include "MessagePort.h"
#include "Document.h"
#endif
-#if ENABLE(SQL_DATABASE)
-#include "DatabaseContext.h"
-#endif
-
using namespace Inspector;
namespace WebCore {
return downcast<WorkerGlobalScope>(*this).script()->vm();
}
-#if ENABLE(SQL_DATABASE)
void ScriptExecutionContext::setDatabaseContext(DatabaseContext* databaseContext)
{
ASSERT(!m_databaseContext);
m_databaseContext = databaseContext;
}
-#endif
bool ScriptExecutionContext::hasPendingActivity() const
{
virtual EventQueue& eventQueue() const = 0;
-#if ENABLE(SQL_DATABASE)
void setDatabaseContext(DatabaseContext*);
-#endif
#if ENABLE(SUBTLE_CRYPTO)
virtual bool wrapCryptoKey(const Vector<uint8_t>& key, Vector<uint8_t>& wrappedKey) = 0;
std::unique_ptr<PublicURLManager> m_publicURLManager;
-#if ENABLE(SQL_DATABASE)
RefPtr<DatabaseContext> m_databaseContext;
-#endif
bool m_activeDOMObjectAdditionForbidden;
int m_timerNestingLevel;
FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHTTPSNoStoreKey);
rejectReasons |= 1 << IsHttpsAndCacheControlled;
}
-#if ENABLE(SQL_DATABASE)
if (DatabaseManager::manager().hasOpenDatabases(frame->document())) {
PCLOG(" -Frame has open database handles");
FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHasOpenDatabasesKey);
rejectReasons |= 1 << HasDatabaseHandles;
}
-#endif
if (!frame->loader().history().currentItem()) {
PCLOG(" -No current history item");
FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureNoCurrentHistoryItemKey);
&& !(documentLoader->substituteData().isValid() && !documentLoader->substituteData().failingURL().isEmpty())
&& (!frameLoader.subframeLoader().containsPlugins() || frame->page()->settings().pageCacheSupportsPlugins())
&& !(frame->isMainFrame() && document->url().protocolIs("https") && documentLoader->response().cacheControlContainsNoStore())
-#if ENABLE(SQL_DATABASE)
&& !DatabaseManager::manager().hasOpenDatabases(document)
-#endif
&& frameLoader.history().currentItem()
&& !frameLoader.quickRedirectComing()
&& !documentLoader->isLoadingInAPISense()
#if ENABLE(INSPECTOR)
+#include "Database.h"
#include "Element.h"
#include "Frame.h"
#include "FrameLoader.h"
#include <wtf/RefPtr.h>
#include <wtf/StdLibExtras.h>
-#if ENABLE(SQL_DATABASE)
-#include "Database.h"
-#endif
-
using namespace Inspector;
namespace WebCore {
, m_consoleAgent(nullptr)
, m_domAgent(nullptr)
, m_domStorageAgent(nullptr)
-#if ENABLE(SQL_DATABASE)
, m_databaseAgent(nullptr)
-#endif
{
m_defaultInspectableObject = std::make_unique<InspectableObject>();
}
m_consoleAgent = nullptr;
m_domAgent = nullptr;
m_domStorageAgent = nullptr;
-#if ENABLE(SQL_DATABASE)
m_databaseAgent = nullptr;
-#endif
}
void CommandLineAPIHost::inspectImpl(RefPtr<InspectorValue>&& object, RefPtr<InspectorValue>&& hints)
return m_inspectedObjects[index].get();
}
-#if ENABLE(SQL_DATABASE)
String CommandLineAPIHost::databaseIdImpl(Database* database)
{
if (m_databaseAgent)
return m_databaseAgent->databaseId(database);
return String();
}
-#endif
String CommandLineAPIHost::storageIdImpl(Storage* storage)
{
, Inspector::InspectorConsoleAgent* consoleAgent
, InspectorDOMAgent* domAgent
, InspectorDOMStorageAgent* domStorageAgent
-#if ENABLE(SQL_DATABASE)
, InspectorDatabaseAgent* databaseAgent
-#endif
)
{
m_inspectorAgent = inspectorAgent;
m_consoleAgent = consoleAgent;
m_domAgent = domAgent;
m_domStorageAgent = domStorageAgent;
-#if ENABLE(SQL_DATABASE)
m_databaseAgent = databaseAgent;
-#endif
}
void disconnect();
void getEventListenersImpl(Node*, Vector<EventListenerInfo>& listenersArray);
-#if ENABLE(SQL_DATABASE)
String databaseIdImpl(Database*);
-#endif
String storageIdImpl(Storage*);
private:
Inspector::InspectorConsoleAgent* m_consoleAgent;
InspectorDOMAgent* m_domAgent;
InspectorDOMStorageAgent* m_domStorageAgent;
-#if ENABLE(SQL_DATABASE)
InspectorDatabaseAgent* m_databaseAgent;
-#endif
Vector<std::unique_ptr<InspectableObject>> m_inspectedObjects;
std::unique_ptr<InspectableObject> m_defaultInspectableObject;
m_agents.append(std::make_unique<InspectorCSSAgent>(m_instrumentingAgents.get(), m_domAgent));
-#if ENABLE(SQL_DATABASE)
auto databaseAgentPtr = std::make_unique<InspectorDatabaseAgent>(m_instrumentingAgents.get());
InspectorDatabaseAgent* databaseAgent = databaseAgentPtr.get();
m_agents.append(WTF::move(databaseAgentPtr));
-#endif
#if ENABLE(INDEXED_DATABASE)
m_agents.append(std::make_unique<InspectorIndexedDBAgent>(m_instrumentingAgents.get(), m_injectedScriptManager.get(), pageAgent));
, consoleAgent
, m_domAgent
, domStorageAgent
-#if ENABLE(SQL_DATABASE)
, databaseAgent
-#endif
);
}
#include "config.h"
-#if ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
+#if ENABLE(INSPECTOR)
#include "InspectorDatabaseAgent.h"
} // namespace WebCore
-#endif // ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
+#endif // ENABLE(INSPECTOR)
#ifndef InspectorDatabaseAgent_h
#define InspectorDatabaseAgent_h
-#if ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
+#if ENABLE(INSPECTOR)
#include "InspectorWebAgentBase.h"
#include <inspector/InspectorBackendDispatchers.h>
} // namespace WebCore
-#endif // ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
+#endif // ENABLE(INSPECTOR)
#endif // !defined(InspectorDatabaseAgent_h)
namespace WebCore {
-#if ENABLE(SQL_DATABASE)
inline void InspectorInstrumentation::didOpenDatabase(ScriptExecutionContext* context, RefPtr<Database>&& database, const String& domain, const String& name, const String& version)
{
#if ENABLE(INSPECTOR)
UNUSED_PARAM(version);
#endif
}
-#endif
} // namespace WebCore
#include "config.h"
-#if ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
+#if ENABLE(INSPECTOR)
#include "InspectorDatabaseResource.h"
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
+#endif // ENABLE(INSPECTOR)
#ifndef InspectorDatabaseResource_h
#define InspectorDatabaseResource_h
-#if ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
+#if ENABLE(INSPECTOR)
#include <inspector/InspectorFrontendDispatchers.h>
#include <wtf/RefCounted.h>
} // namespace WebCore
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(INSPECTOR)
#endif // InspectorDatabaseResource_h
if (InspectorCSSAgent* cssAgent = instrumentingAgents.inspectorCSSAgent())
cssAgent->reset();
-#if ENABLE(SQL_DATABASE)
if (InspectorDatabaseAgent* databaseAgent = instrumentingAgents.inspectorDatabaseAgent())
databaseAgent->clearResources();
-#endif
if (InspectorDOMAgent* domAgent = instrumentingAgents.inspectorDOMAgent())
domAgent->setDocument(page->mainFrame().document());
return nullptr;
}
-#if ENABLE(SQL_DATABASE)
void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents& instrumentingAgents, RefPtr<Database>&& database, const String& domain, const String& name, const String& version)
{
if (!instrumentingAgents.inspectorEnvironment().developerExtrasEnabled())
if (InspectorDatabaseAgent* dbAgent = instrumentingAgents.inspectorDatabaseAgent())
dbAgent->didOpenDatabase(database, domain, name, version);
}
-#endif
void InspectorInstrumentation::didDispatchDOMStorageEventImpl(InstrumentingAgents& instrumentingAgents, const String& key, const String& oldValue, const String& newValue, StorageType storageType, SecurityOrigin* securityOrigin, Page* page)
{
static void startProfiling(Page&, JSC::ExecState*, const String& title);
static RefPtr<JSC::Profile> stopProfiling(Page&, JSC::ExecState*, const String& title);
-#if ENABLE(SQL_DATABASE)
static void didOpenDatabase(ScriptExecutionContext*, RefPtr<Database>&&, const String& domain, const String& name, const String& version);
-#endif
static void didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
static void startProfilingImpl(InstrumentingAgents&, JSC::ExecState*, const String& title);
static RefPtr<JSC::Profile> stopProfilingImpl(InstrumentingAgents&, JSC::ExecState*, const String& title);
-#if ENABLE(SQL_DATABASE)
static void didOpenDatabaseImpl(InstrumentingAgents&, RefPtr<Database>&&, const String& domain, const String& name, const String& version);
-#endif
static void didDispatchDOMStorageEventImpl(InstrumentingAgents&, const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
#if ENABLE(WEB_REPLAY)
, m_inspectorReplayAgent(nullptr)
#endif
-#if ENABLE(SQL_DATABASE)
, m_inspectorDatabaseAgent(nullptr)
-#endif
, m_inspectorApplicationCacheAgent(nullptr)
, m_inspectorDebuggerAgent(nullptr)
, m_pageDebuggerAgent(nullptr)
#if ENABLE(WEB_REPLAY)
m_inspectorReplayAgent = nullptr;
#endif
-#if ENABLE(SQL_DATABASE)
m_inspectorDatabaseAgent = nullptr;
-#endif
m_inspectorApplicationCacheAgent = nullptr;
m_inspectorDebuggerAgent = nullptr;
m_pageDebuggerAgent = nullptr;
void setInspectorReplayAgent(InspectorReplayAgent* agent) { m_inspectorReplayAgent = agent; }
#endif
-#if ENABLE(SQL_DATABASE)
InspectorDatabaseAgent* inspectorDatabaseAgent() const { return m_inspectorDatabaseAgent; }
void setInspectorDatabaseAgent(InspectorDatabaseAgent* agent) { m_inspectorDatabaseAgent = agent; }
-#endif
InspectorApplicationCacheAgent* inspectorApplicationCacheAgent() const { return m_inspectorApplicationCacheAgent; }
void setInspectorApplicationCacheAgent(InspectorApplicationCacheAgent* agent) { m_inspectorApplicationCacheAgent = agent; }
#if ENABLE(WEB_REPLAY)
InspectorReplayAgent* m_inspectorReplayAgent;
#endif
-#if ENABLE(SQL_DATABASE)
InspectorDatabaseAgent* m_inspectorDatabaseAgent;
-#endif
InspectorApplicationCacheAgent* m_inspectorApplicationCacheAgent;
Inspector::InspectorDebuggerAgent* m_inspectorDebuggerAgent;
PageDebuggerAgent* m_pageDebuggerAgent;
, nullptr
, nullptr
, nullptr
-#if ENABLE(SQL_DATABASE)
, nullptr
-#endif
);
}
}
virtual void print(Frame*) override { }
-#if ENABLE(SQL_DATABASE)
virtual void exceededDatabaseQuota(Frame*, const String&, DatabaseDetails) override { }
-#endif
virtual void reachedMaxAppCacheSize(int64_t) override { }
virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t) override { }
// http://www.w3.org/Bugs/Public/show_bug.cgi?id=10537
doc->setReadyState(Document::Complete);
-#if ENABLE(SQL_DATABASE)
// FIXME: Should the DatabaseManager watch for something like ActiveDOMObject::stop() rather than being special-cased here?
DatabaseManager::manager().stopDatabases(doc, 0);
-#endif
}
// FIXME: This will cancel redirection timer, which really needs to be restarted when restoring the frame from b/f cache.
#include "AXObjectCache.h"
#include "Cursor.h"
+#include "DatabaseDetails.h"
#include "DisplayRefreshMonitor.h"
#include "FocusDirection.h"
#include "FrameLoader.h"
#endif
#endif
-#if ENABLE(SQL_DATABASE)
-#include "DatabaseDetails.h"
-#endif
-
OBJC_CLASS NSResponder;
namespace WebCore {
virtual void pageExtendedBackgroundColorDidChange(Color) const { }
-#if ENABLE(SQL_DATABASE)
virtual void exceededDatabaseQuota(Frame*, const String& databaseName, DatabaseDetails) = 0;
-#endif
// Callback invoked when the application cache fails to save a cache object
// because storing it would grow the database file past its defined maximum
static const char FeatureCounterPageCacheFailureIsErrorPageKey[] = "com.apple.WebKit.pageCache.failure.isErrorPage";
static const char FeatureCounterPageCacheFailureHasPlugins[] = "com.apple.WebKit.pageCache.failure.hasPlugins";
static const char FeatureCounterPageCacheFailureHTTPSNoStoreKey[] = "com.apple.WebKit.pageCache.failure.httpsNoStore";
-#if ENABLE(SQL_DATABASE)
static const char FeatureCounterPageCacheFailureHasOpenDatabasesKey[] = "com.apple.WebKit.pageCache.failure.hasOpenDatabases";
-#endif
static const char FeatureCounterPageCacheFailureNoCurrentHistoryItemKey[] = "com.apple.WebKit.pageCache.failure.noCurrentHistoryItem";
static const char FeatureCounterPageCacheFailureQuirkRedirectComingKey[] = "com.apple.WebKit.pageCache.failure.quirkRedirectComing";
static const char FeatureCounterPageCacheFailureLoadingAPISenseKey[] = "com.apple.WebKit.pageCache.failure.loadingAPISense";
+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Storage/WebDatabaseManager.mm:
+ (databasesDirectoryPath):
+ * Storage/WebDatabaseManagerClient.h:
+ * Storage/WebDatabaseManagerClient.mm:
+ * Storage/WebDatabaseManagerInternal.h:
+ * Storage/WebDatabaseManagerPrivate.h:
+ * Storage/WebDatabaseQuotaManager.mm:
+ (-[WebDatabaseQuotaManager usage]):
+ (-[WebDatabaseQuotaManager quota]):
+ (-[WebDatabaseQuotaManager setQuota:]):
+ * 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:]):
+ (-[WebView _preferencesChanged:]):
+
2015-01-14 Chris Dumez <cdumez@apple.com>
Make 'TypeName' parameter unnecessary in CSSPropertyNames.in
ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
-ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
ENABLE_SUBTLE_CRYPTO[sdk=iphone*] = ENABLE_SUBTLE_CRYPTO;
ENABLE_SUBTLE_CRYPTO[sdk=macosx*] = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
#import "WebDatabaseManagerPrivate.h"
-#if ENABLE(SQL_DATABASE)
-
#import "WebDatabaseManagerClient.h"
#import "WebPlatformStrategies.h"
#import "WebSecurityOriginInternal.h"
return [databasesDirectory stringByStandardizingPath];
}
-
-#endif
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if ENABLE(SQL_DATABASE)
-
#import <WebCore/DatabaseManagerClient.h>
class WebDatabaseManagerClient : public WebCore::DatabaseManagerClient {
bool m_isHandlingDeleteDatabaseOriginNotification;
#endif
};
-
-#endif
#import "WebDatabaseManagerClient.h"
-#if ENABLE(SQL_DATABASE)
-
#import "WebDatabaseManagerPrivate.h"
#import "WebSecurityOriginInternal.h"
#import <wtf/MainThread.h>
}
#endif // PLATFORM(IOS)
-
-#endif
#import "WebDatabaseManagerPrivate.h"
-#if ENABLE(SQL_DATABASE)
-
#if PLATFORM(IOS)
@interface WebDatabaseManager (WebDatabaseManagerInternal)
+ (void)willBeginFirstTransaction;
void WebKitSetWebDatabasePaused(bool);
#endif
-
-#endif
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if !defined(ENABLE_SQL_DATABASE)
-#define ENABLE_SQL_DATABASE 1
-#endif
-
-#if ENABLE_SQL_DATABASE
-
extern NSString *WebDatabaseDirectoryDefaultsKey;
extern NSString *WebDatabaseDisplayNameKey;
+ (void)scheduleEmptyDatabaseRemoval;
#endif
@end
-
-#endif // ENABLE_SQL_DATABASE
- (unsigned long long)usage
{
-#if ENABLE(SQL_DATABASE)
return DatabaseManager::manager().usageForOrigin([_origin _core]);
-#else
- return 0;
-#endif
}
- (unsigned long long)quota
{
-#if ENABLE(SQL_DATABASE)
return DatabaseManager::manager().quotaForOrigin([_origin _core]);
-#else
- return 0;
-#endif
}
// If the quota is set to a value lower than the current usage, that quota will
// prevent new data from being added to databases in that origin.
- (void)setQuota:(unsigned long long)quota
{
-#if ENABLE(SQL_DATABASE)
DatabaseManager::manager().setQuota([_origin _core], quota);
-#endif
}
@end
virtual void setToolTip(const WTF::String&, WebCore::TextDirection) override;
virtual void print(WebCore::Frame*) override;
-#if ENABLE(SQL_DATABASE)
virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String& databaseName, WebCore::DatabaseDetails) override;
-#endif
virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) override;
virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded) override;
CallUIDelegate(m_webView, @selector(webView:printFrameView:), [webFrame frameView]);
}
-#if ENABLE(SQL_DATABASE)
-
void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseName, DatabaseDetails)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
END_BLOCK_OBJC_EXCEPTIONS;
}
-#endif
-
void WebChromeClient::reachedMaxAppCacheSize(int64_t spaceNeeded)
{
// FIXME: Free some space.
- (unsigned long long)usage
{
-#if ENABLE(SQL_DATABASE)
return DatabaseManager::manager().usageForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
-#else
- return 0;
-#endif
}
- (unsigned long long)quota
{
-#if ENABLE(SQL_DATABASE)
return DatabaseManager::manager().quotaForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
-#else
- return 0;
-#endif
}
- (void)setQuota:(unsigned long long)quota
{
-#if ENABLE(SQL_DATABASE)
DatabaseManager::manager().setQuota(reinterpret_cast<SecurityOrigin*>(_private), quota);
-#endif
}
@end
}
if (Document* document = _private->coreFrame->document()) {
-#if ENABLE(SQL_DATABASE)
if (DatabaseManager::manager().hasOpenDatabases(document))
[result setObject:[NSNumber numberWithBool:YES] forKey:WebFrameUsesDatabases];
-#endif
if (!document->canSuspendActiveDOMObjects())
[result setObject:[NSNumber numberWithBool:YES] forKey:WebFrameCanSuspendActiveDOMObjects];
}
// of the initialization code which may depend on the strategies.
WebPlatformStrategies::initializeIfNecessary();
-#if ENABLE(SQL_DATABASE)
#if PLATFORM(IOS)
// Set the WebSQLiteDatabaseTrackerClient.
SQLiteDatabaseTracker::setClient(WebSQLiteDatabaseTrackerClient::sharedWebSQLiteDatabaseTrackerClient());
if ([standardPreferences databasesEnabled])
#endif
[WebDatabaseManager sharedWebDatabaseManager];
-#endif
#if PLATFORM(IOS)
if ([standardPreferences storageTrackerEnabled])
settings.setQTKitEnabled([preferences isQTKitEnabled]);
#endif // PLATFORM(MAC)
-#if ENABLE(SQL_DATABASE)
DatabaseManager::manager().setIsAvailable([preferences databasesEnabled]);
-#endif
#if ENABLE(MEDIA_SOURCE)
settings.setMediaSourceEnabled([preferences mediaSourceEnabled]);
+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * ForEachCoClass.h:
+ * WebCoreSupport/WebChromeClient.cpp:
+ (WebChromeClient::exceededDatabaseQuota):
+ * WebCoreSupport/WebChromeClient.h:
+ * WebDatabaseManager.cpp:
+ (WebKitInitializeWebDatabasesIfNecessary):
+ * WebDatabaseManager.h:
+ * WebSecurityOrigin.cpp:
+ (WebSecurityOrigin::usage):
+ (WebSecurityOrigin::quota):
+ (WebSecurityOrigin::setQuota):
+ * WebView.cpp:
+ (WebView::initWithFrame):
+ (WebView::notifyPreferencesChanged):
+
2015-01-15 Brent Fulgham <bfulgham@apple.com>
[Win] Unreviewed build fix after r178510
#include "ProgIDMacros.h"
-#if ENABLE(SQL_DATABASE)
#define WEB_DATABASE_MANAGER(macro) macro(WebDatabaseManager)
-#else
-#define WEB_DATABASE_MANAGER(macro)
-#endif
// Items may only be added to the end of this macro. No items may be removed from it.
#define FOR_EACH_COCLASS(macro) \
uiDelegate->printFrame(m_webView, kit(frame));
}
-#if ENABLE(SQL_DATABASE)
void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseIdentifier, DatabaseDetails)
{
COMPtr<WebSecurityOrigin> origin(AdoptCOM, WebSecurityOrigin::createInstance(frame->document()->securityOrigin()));
}
}
}
-#endif
// FIXME: Move this include to the top of the file with the other includes.
#include "ApplicationCacheStorage.h"
virtual void print(WebCore::Frame*);
-#if ENABLE(SQL_DATABASE)
virtual void exceededDatabaseQuota(WebCore::Frame*, const WTF::String&, WebCore::DatabaseDetails);
-#endif
virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded);
#include "WebDatabaseManager.h"
#include "WebKitDLL.h"
-#if ENABLE(SQL_DATABASE)
-
#include "COMEnumVariant.h"
#include "COMPropertyBag.h"
#include "MarshallingHelpers.h"
initialized = true;
}
-
-#endif
#ifndef WebDatabaseManager_h
#define WebDatabaseManager_h
-#if ENABLE(SQL_DATABASE)
-
#include "WebKit.h"
#include <WebCore/DatabaseManagerClient.h>
void WebKitInitializeWebDatabasesIfNecessary();
#endif
-
-#endif
HRESULT WebSecurityOrigin::usage(/* [retval][out] */ unsigned long long* result)
{
-#if ENABLE(SQL_DATABASE)
if (!result)
return E_POINTER;
*result = DatabaseManager::manager().usageForOrigin(m_securityOrigin.get());
return S_OK;
-#else
- UNUSED_PARAM(result);
- return E_NOTIMPL;
-#endif
}
HRESULT WebSecurityOrigin::quota(/* [retval][out] */ unsigned long long* result)
{
-#if ENABLE(SQL_DATABASE)
if (!result)
return E_POINTER;
*result = DatabaseManager::manager().quotaForOrigin(m_securityOrigin.get());
return S_OK;
-#else
- UNUSED_PARAM(result);
- return E_NOTIMPL;
-#endif
}
HRESULT WebSecurityOrigin::setQuota(/* [in] */ unsigned long long quota)
{
-#if ENABLE(SQL_DATABASE)
DatabaseManager::manager().setQuota(m_securityOrigin.get(), quota);
return S_OK;
-#else
- UNUSED_PARAM(quota);
- return E_NOTIMPL;
-#endif
}
HRESULT WebSecurityOrigin::initWithURL(/* [in] */ BSTR urlBstr)
// of the initialization code which may depend on the strategies.
WebPlatformStrategies::initialize();
-#if ENABLE(SQL_DATABASE)
WebKitInitializeWebDatabasesIfNecessary();
-#endif
WebKitSetApplicationCachePathIfNecessary();
Settings::setDefaultMinDOMTimerInterval(0.004);
return hr;
settings.setOfflineWebApplicationCacheEnabled(enabled);
-#if ENABLE(SQL_DATABASE)
hr = prefsPrivate->databasesEnabled(&enabled);
if (FAILED(hr))
return hr;
DatabaseManager::manager().setIsAvailable(enabled);
-#endif
hr = prefsPrivate->localStorageEnabled(&enabled);
if (FAILED(hr))
+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Shared/OriginAndDatabases.cpp:
+ * Shared/OriginAndDatabases.h:
+ * Shared/WebCoreArgumentCoders.cpp:
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextGetDatabaseManager):
+ * UIProcess/API/C/WKDatabaseManager.cpp:
+ (WKDatabaseManagerGetTypeID):
+ (WKDatabaseManagerGetOriginKey):
+ (WKDatabaseManagerGetOriginQuotaKey):
+ (WKDatabaseManagerGetOriginUsageKey):
+ (WKDatabaseManagerGetDatabaseDetailsKey):
+ (WKDatabaseManagerGetDatabaseDetailsNameKey):
+ (WKDatabaseManagerGetDatabaseDetailsDisplayNameKey):
+ (WKDatabaseManagerGetDatabaseDetailsExpectedUsageKey):
+ (WKDatabaseManagerGetDatabaseDetailsCurrentUsageKey):
+ (WKDatabaseManagerGetDatabaseDetailsCreationTimeKey):
+ (WKDatabaseManagerGetDatabaseDetailsModificationTimeKey):
+ (WKDatabaseManagerSetClient):
+ (WKDatabaseManagerGetDatabasesByOrigin):
+ (WKDatabaseManagerGetDatabaseOrigins):
+ (WKDatabaseManagerDeleteDatabasesWithNameForOrigin):
+ (WKDatabaseManagerDeleteDatabasesForOrigin):
+ (WKDatabaseManagerDeleteAllDatabases):
+ (WKDatabaseManagerSetQuotaForOrigin):
+ * UIProcess/API/efl/EwkView.cpp:
+ (EwkView::informDatabaseQuotaReached):
+ * UIProcess/WebDatabaseManagerProxy.cpp:
+ * UIProcess/WebDatabaseManagerProxy.h:
+ * UIProcess/WebDatabaseManagerProxy.messages.in:
+ * UIProcess/WebProcessPool.cpp:
+ * UIProcess/efl/PageUIClientEfl.cpp:
+ (WebKit::PageUIClientEfl::PageUIClientEfl):
+ (WebKit::PageUIClientEfl::exceededDatabaseQuota):
+ * UIProcess/efl/PageUIClientEfl.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::clearAllDatabases):
+ (WebKit::InjectedBundle::setDatabaseQuota):
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::exceededDatabaseQuota):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
+ * WebProcess/WebCoreSupport/WebDatabaseManager.h:
+ * WebProcess/WebCoreSupport/WebDatabaseManager.messages.in:
+ * WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp:
+ * WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess):
+
2015-01-15 Anders Carlsson <andersca@apple.com>
Add a connection parameter to StorageManager willOpen/didClose functions
ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
-ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE;
ENABLE_SUBTLE_CRYPTO[sdk=iphone*] = ENABLE_SUBTLE_CRYPTO;
ENABLE_SUBTLE_CRYPTO[sdk=macosx*] = $(ENABLE_SUBTLE_CRYPTO_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
ENABLE_SUBTLE_CRYPTO_macosx_1080 = ;
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
#include "config.h"
#include "OriginAndDatabases.h"
-#if ENABLE(SQL_DATABASE)
-
#include "WebCoreArgumentCoders.h"
using namespace WebCore;
}
} // namespace WebKit
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef OriginAndDatabases_h
#define OriginAndDatabases_h
-#if ENABLE(SQL_DATABASE)
-
#include <WebCore/DatabaseDetails.h>
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
} // namespace WebKit
-#endif // ENABLE(SQL_DATABASE)
-
#endif // OriginAndDatabases_h
return true;
}
-
-#if ENABLE(SQL_DATABASE)
void ArgumentCoder<DatabaseDetails>::encode(ArgumentEncoder& encoder, const DatabaseDetails& details)
{
encoder << details.name();
return true;
}
-#endif
-
#if PLATFORM(IOS)
void ArgumentCoder<Highlight>::encode(ArgumentEncoder& encoder, const Highlight& highlight)
// Supplements
#include "WebApplicationCacheManagerProxy.h"
#include "WebCookieManagerProxy.h"
+#include "WebDatabaseManagerProxy.h"
#include "WebGeolocationManagerProxy.h"
#include "WebKeyValueStorageManager.h"
#include "WebMediaCacheManagerProxy.h"
#include "WebNotificationManagerProxy.h"
#include "WebOriginDataManagerProxy.h"
#include "WebResourceCacheManagerProxy.h"
-#if ENABLE(SQL_DATABASE)
-#include "WebDatabaseManagerProxy.h"
-#endif
#if ENABLE(BATTERY_STATUS)
#include "WebBatteryManagerProxy.h"
#endif
WKDatabaseManagerRef WKContextGetDatabaseManager(WKContextRef contextRef)
{
-#if ENABLE(SQL_DATABASE)
return toAPI(toImpl(contextRef)->supplement<WebDatabaseManagerProxy>());
-#else
- UNUSED_PARAM(contextRef);
- return 0;
-#endif
}
WKGeolocationManagerRef WKContextGetGeolocationManager(WKContextRef contextRef)
WKTypeID WKDatabaseManagerGetTypeID()
{
-#if ENABLE(SQL_DATABASE)
return toAPI(WebDatabaseManagerProxy::APIType);
-#else
- return 0;
-#endif
}
WKStringRef WKDatabaseManagerGetOriginKey()
{
-#if ENABLE(SQL_DATABASE)
static API::String* key = API::String::create(WebDatabaseManagerProxy::originKey()).leakRef();
return toAPI(key);
-#else
- return 0;
-#endif
}
WKStringRef WKDatabaseManagerGetOriginQuotaKey()
{
-#if ENABLE(SQL_DATABASE)
static API::String* key = API::String::create(WebDatabaseManagerProxy::originQuotaKey()).leakRef();
return toAPI(key);
-#else
- return 0;
-#endif
}
WKStringRef WKDatabaseManagerGetOriginUsageKey()
{
-#if ENABLE(SQL_DATABASE)
static API::String* key = API::String::create(WebDatabaseManagerProxy::originUsageKey()).leakRef();
return toAPI(key);
-#else
- return 0;
-#endif
}
WKStringRef WKDatabaseManagerGetDatabaseDetailsKey()
{
-#if ENABLE(SQL_DATABASE)
static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsKey()).leakRef();
return toAPI(key);
-#else
- return 0;
-#endif
}
WKStringRef WKDatabaseManagerGetDatabaseDetailsNameKey()
{
-#if ENABLE(SQL_DATABASE)
static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsNameKey()).leakRef();
return toAPI(key);
-#else
- return 0;
-#endif
}
WKStringRef WKDatabaseManagerGetDatabaseDetailsDisplayNameKey()
{
-#if ENABLE(SQL_DATABASE)
static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsDisplayNameKey()).leakRef();
return toAPI(key);
-#else
- return 0;
-#endif
}
WKStringRef WKDatabaseManagerGetDatabaseDetailsExpectedUsageKey()
{
-#if ENABLE(SQL_DATABASE)
static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsExpectedUsageKey()).leakRef();
return toAPI(key);
-#else
- return 0;
-#endif
}
WKStringRef WKDatabaseManagerGetDatabaseDetailsCurrentUsageKey()
{
-#if ENABLE(SQL_DATABASE)
static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsCurrentUsageKey()).leakRef();
return toAPI(key);
-#else
- return 0;
-#endif
}
WKStringRef WKDatabaseManagerGetDatabaseDetailsCreationTimeKey()
{
-#if ENABLE(SQL_DATABASE)
static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsCreationTimeKey()).leakRef();
return toAPI(key);
-#else
- return 0;
-#endif
}
WKStringRef WKDatabaseManagerGetDatabaseDetailsModificationTimeKey()
{
-#if ENABLE(SQL_DATABASE)
static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsModificationTimeKey()).leakRef();
return toAPI(key);
-#else
- return 0;
-#endif
}
void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManagerRef, const WKDatabaseManagerClientBase* wkClient)
{
-#if ENABLE(SQL_DATABASE)
if (wkClient && wkClient->version)
return;
toImpl(databaseManagerRef)->initializeClient(wkClient);
-#else
- UNUSED_PARAM(databaseManagerRef);
- UNUSED_PARAM(wkClient);
-#endif
}
void WKDatabaseManagerGetDatabasesByOrigin(WKDatabaseManagerRef databaseManagerRef, void* context, WKDatabaseManagerGetDatabasesByOriginFunction callback)
{
-#if ENABLE(SQL_DATABASE)
toImpl(databaseManagerRef)->getDatabasesByOrigin(toGenericCallbackFunction(context, callback));
-#else
- UNUSED_PARAM(databaseManagerRef);
- UNUSED_PARAM(context);
- UNUSED_PARAM(callback);
-#endif
}
void WKDatabaseManagerGetDatabaseOrigins(WKDatabaseManagerRef databaseManagerRef, void* context, WKDatabaseManagerGetDatabaseOriginsFunction callback)
{
-#if ENABLE(SQL_DATABASE)
toImpl(databaseManagerRef)->getDatabaseOrigins(toGenericCallbackFunction(context, callback));
-#else
- UNUSED_PARAM(databaseManagerRef);
- UNUSED_PARAM(context);
- UNUSED_PARAM(callback);
-#endif
}
void WKDatabaseManagerDeleteDatabasesWithNameForOrigin(WKDatabaseManagerRef databaseManagerRef, WKStringRef databaseNameRef, WKSecurityOriginRef originRef)
{
-#if ENABLE(SQL_DATABASE)
toImpl(databaseManagerRef)->deleteDatabaseWithNameForOrigin(toWTFString(databaseNameRef), toImpl(originRef));
-#else
- UNUSED_PARAM(databaseManagerRef);
- UNUSED_PARAM(databaseNameRef);
- UNUSED_PARAM(originRef);
-#endif
}
void WKDatabaseManagerDeleteDatabasesForOrigin(WKDatabaseManagerRef databaseManagerRef, WKSecurityOriginRef originRef)
{
-#if ENABLE(SQL_DATABASE)
toImpl(databaseManagerRef)->deleteDatabasesForOrigin(toImpl(originRef));
-#else
- UNUSED_PARAM(databaseManagerRef);
- UNUSED_PARAM(originRef);
-#endif
}
void WKDatabaseManagerDeleteAllDatabases(WKDatabaseManagerRef databaseManagerRef)
{
-#if ENABLE(SQL_DATABASE)
toImpl(databaseManagerRef)->deleteAllDatabases();
-#else
- UNUSED_PARAM(databaseManagerRef);
-#endif
}
void WKDatabaseManagerSetQuotaForOrigin(WKDatabaseManagerRef databaseManagerRef, WKSecurityOriginRef originRef, uint64_t quota)
{
-#if ENABLE(SQL_DATABASE)
toImpl(databaseManagerRef)->setQuotaForOrigin(toImpl(originRef), quota);
-#else
- UNUSED_PARAM(databaseManagerRef);
- UNUSED_PARAM(originRef);
- UNUSED_PARAM(quota);
-#endif
}
return WKEinaSharedString::adopt(sd->api->run_javascript_prompt(sd, message, defaultValue));
}
-#if ENABLE(SQL_DATABASE)
/**
* @internal
* Calls exceeded_database_quota callback or falls back to default behavior returns default database quota.
return defaultQuota;
}
-#endif
WebView* EwkView::webView()
{
#include "config.h"
#include "WebDatabaseManagerProxy.h"
-#if ENABLE(SQL_DATABASE)
-
#include "APIArray.h"
#include "APIDictionary.h"
#include "APISecurityOrigin.h"
}
} // namespace WebKit
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef WebDatabaseManagerProxy_h
#define WebDatabaseManagerProxy_h
-#if ENABLE(SQL_DATABASE)
-
#include "APIObject.h"
#include "Arguments.h"
#include "GenericCallback.h"
} // namespace WebKit
-#endif // ENABLE(SQL_DATABASE)
-
#endif // DatabaseManagerProxy_h
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#if ENABLE(SQL_DATABASE)
-
messages -> WebDatabaseManagerProxy {
DidGetDatabasesByOrigin(Vector<WebKit::OriginAndDatabases> originAndDatabases, uint64_t callbackID);
DidGetDatabaseOrigins(Vector<String> originIdentifiers, uint64_t callbackID)
DidModifyOrigin(String originIdentifier)
DidModifyDatabase(String originIdentifier, String databaseIdentifier)
}
-
-#endif // ENABLE(SQL_DATABASE)
addSupplement<WebMediaCacheManagerProxy>();
addSupplement<WebNotificationManagerProxy>();
addSupplement<WebResourceCacheManagerProxy>();
-#if ENABLE(SQL_DATABASE)
addSupplement<WebDatabaseManagerProxy>();
-#endif
#if USE(SOUP)
addSupplement<WebSoupCustomProtocolRequestManager>();
#endif
uiClient.getWindowFrame = getWindowFrame;
uiClient.setWindowFrame = setWindowFrame;
uiClient.runBeforeUnloadConfirmPanel = runBeforeUnloadConfirmPanel;
-#if ENABLE(SQL_DATABASE)
uiClient.exceededDatabaseQuota = exceededDatabaseQuota;
-#endif
uiClient.runOpenPanel = runOpenPanel;
uiClient.createNewPage = createNewPage;
return toPageUIClientEfl(clientInfo)->m_view->requestJSConfirmPopup(WKEinaSharedString(message));
}
-#if ENABLE(SQL_DATABASE)
unsigned long long PageUIClientEfl::exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef databaseName, WKStringRef displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage, const void* clientInfo)
{
EwkView* view = toPageUIClientEfl(clientInfo)->m_view;
return view->informDatabaseQuotaReached(toImpl(databaseName)->string(), toImpl(displayName)->string(), currentQuota, currentOriginUsage, currentDatabaseUsage, expectedUsage);
}
-#endif
void PageUIClientEfl::runOpenPanel(WKPageRef, WKFrameRef, WKOpenPanelParametersRef parameters, WKOpenPanelResultListenerRef listener, const void* clientInfo)
{
static WKRect getWindowFrame(WKPageRef, const void*);
static void setWindowFrame(WKPageRef, WKRect, const void*);
static bool runBeforeUnloadConfirmPanel(WKPageRef, WKStringRef, WKFrameRef, const void*);
-#if ENABLE(SQL_DATABASE)
static unsigned long long exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef, WKStringRef, unsigned long long currentQuota, unsigned long long, unsigned long long, unsigned long long, const void*);
-#endif
static void runOpenPanel(WKPageRef, WKFrameRef, WKOpenPanelParametersRef, WKOpenPanelResultListenerRef, const void*);
static WKPageRef createNewPage(WKPageRef, WKURLRequestRef, WKDictionaryRef, WKEventModifiers, WKEventMouseButton, const void*);
void InjectedBundle::clearAllDatabases()
{
-#if ENABLE(SQL_DATABASE)
WebProcess::shared().supplement<WebDatabaseManager>()->deleteAllDatabases();
-#endif
}
void InjectedBundle::setDatabaseQuota(uint64_t quota)
{
-#if ENABLE(SQL_DATABASE)
// Historically, we've used the following (somewhat non-sensical) string
// for the databaseIdentifier of local files.
WebProcess::shared().supplement<WebDatabaseManager>()->setQuotaForOrigin("file__0", quota);
-#else
- UNUSED_PARAM(quota);
-#endif
}
void InjectedBundle::clearApplicationCache()
m_page->sendSync(Messages::WebPageProxy::PrintFrame(webFrame->frameID()), Messages::WebPageProxy::PrintFrame::Reply(), std::chrono::milliseconds::max(), syncSendFlags);
}
-#if ENABLE(SQL_DATABASE)
void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseName, DatabaseDetails details)
{
WebFrame* webFrame = WebFrame::fromCoreFrame(*frame);
dbManager.setQuota(origin, newQuota);
}
-#endif
-
void WebChromeClient::reachedMaxAppCacheSize(int64_t)
{
virtual void setToolTip(const String&, WebCore::TextDirection) override;
virtual void print(WebCore::Frame*) override;
-
-#if ENABLE(SQL_DATABASE)
+
virtual void exceededDatabaseQuota(WebCore::Frame*, const String& databaseName, WebCore::DatabaseDetails) override;
-#endif
virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) override;
virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t spaceNeeded) override;
#include "config.h"
#include "WebDatabaseManager.h"
-#if ENABLE(SQL_DATABASE)
-
#include "OriginAndDatabases.h"
#include "WebCoreArgumentCoders.h"
#include "WebDatabaseManagerMessages.h"
}
} // namespace WebKit
-
-#endif // ENABLE(SQL_DATABASE)
#ifndef WebDatabaseManager_h
#define WebDatabaseManager_h
-#if ENABLE(SQL_DATABASE)
-
#include "MessageReceiver.h"
#include "WebProcessSupplement.h"
#include <WebCore/DatabaseManagerClient.h>
} // namespace WebKit
-#endif // ENABLE(SQL_DATABASE)
-
#endif // WebDatabaseManager_h
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#if ENABLE(SQL_DATABASE)
-
messages -> WebDatabaseManager {
void GetDatabasesByOrigin(uint64_t callbackID)
void GetDatabaseOrigins(uint64_t callbackID)
void DeleteAllDatabases()
void SetQuotaForOrigin(String originIdentifier, uint64_t quota)
}
-
-#endif // ENABLE(SQL_DATABASE)
#include "config.h"
#include "WebSQLiteDatabaseTracker.h"
-#if ENABLE(SQL_DATABASE)
-
#include "WebProcess.h"
#include "WebProcessProxyMessages.h"
#include <WebCore/SQLiteDatabaseTracker.h>
}
} // namespace WebKit
-
-#endif // ENABLE(SQL_DATABASE)
#include <WebCore/SQLiteDatabaseTrackerClient.h>
#include <wtf/Noncopyable.h>
-#if ENABLE(SQL_DATABASE)
-
namespace WebKit {
class WebProcess;
} // namespace WebKit
-#endif // ENABLE(SQL_DATABASE)
-
#endif // WebSQLiteDatabaseTracker_h
settings.setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey()));
settings.setSpatialNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::spatialNavigationEnabledKey()));
-#if ENABLE(SQL_DATABASE)
DatabaseManager::manager().setIsAvailable(store.getBoolValueForKey(WebPreferencesKey::databasesEnabledKey()));
-#endif
#if ENABLE(FULLSCREEN_API)
settings.setFullScreenEnabled(store.getBoolValueForKey(WebPreferencesKey::fullScreenEnabledKey()));
#include "WebConnectionToUIProcess.h"
#include "WebCookieManager.h"
#include "WebCoreArgumentCoders.h"
+#include "WebDatabaseManager.h"
#include "WebFrame.h"
#include "WebFrameNetworkingContext.h"
#include "WebGeolocationManager.h"
#include "WebNotificationManager.h"
#endif
-#if ENABLE(SQL_DATABASE)
-#include "WebDatabaseManager.h"
#if PLATFORM(IOS)
#include "WebSQLiteDatabaseTracker.h"
#endif
-#endif
#if ENABLE(BATTERY_STATUS)
#include "WebBatteryManager.h"
addSupplement<WebCookieManager>();
addSupplement<WebMediaCacheManager>();
addSupplement<AuthenticationManager>();
-
-#if ENABLE(SQL_DATABASE)
addSupplement<WebDatabaseManager>();
#if PLATFORM(IOS)
addSupplement<WebSQLiteDatabaseTracker>();
#endif
-#endif
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
addSupplement<WebNotificationManager>();
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SATURATED_LAYOUT_ARITHMETIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SQL_DATABASE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO_macosx ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO_macosx_1080 OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_CONTROLS "Toggle service controls support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_SQL_DATABASE "Toggle SQL Database Support" ON)
WEBKIT_OPTION_DEFINE(ENABLE_SUBTLE_CRYPTO "Toggle subtle crypto support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG fonts support (imples SVG support)" ON)
WEBKIT_OPTION_DEFINE(ENABLE_TELEPHONE_NUMBER_DETECTION "Toggle telephone number detection support" OFF)
#cmakedefine01 ENABLE_SATURATED_LAYOUT_ARITHMETIC
#cmakedefine01 ENABLE_SMOOTH_SCROLLING
#cmakedefine01 ENABLE_SPELLCHECK
-#cmakedefine01 ENABLE_SQL_DATABASE
#cmakedefine01 ENABLE_SUBTLE_CRYPTO
#cmakedefine01 ENABLE_SVG_FONTS
#cmakedefine01 ENABLE_TELEPHONE_NUMBER_DETECTION
+2015-01-15 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove ENABLE(SQL_DATABASE) guards
+ https://bugs.webkit.org/show_bug.cgi?id=140434
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
2015-01-15 Daniel Bates <dabates@apple.com>
[iOS] REGRESSION (r174642): DumpRenderTree.app test may dump result twice
$resourceTimingSupport,
$scriptedSpeechSupport,
$seccompFiltersSupport,
- $sqlDatabaseSupport,
$styleScopedSupport,
$subtleCrypto,
$suidLinuxSandbox,
{ option => "scripted-speech", desc => "Toggle Scripted Speech support",
define => "ENABLE_SCRIPTED_SPEECH", default => 0, value => \$scriptedSpeechSupport },
- { option => "sql-database", desc => "Toggle SQL Database support",
- define => "ENABLE_SQL_DATABASE", default => 1, value => \$sqlDatabaseSupport },
-
{ option => "subtle-crypto", desc => "Toggle WebCrypto Subtle-Crypto support",
define => "ENABLE_SUBTLE_CRYPTO", default => (isGtk() || isEfl() || isAppleMacWebKit() || isIOSWebKit()), value => \$subtleCrypto },
git://git.webkit.org / WebKit-https.git / commitdiff