Remove ENABLE(SQL_DATABASE) guards
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Jan 2015 08:05:12 +0000 (08:05 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Jan 2015 08:05:12 +0000 (08:05 +0000)
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: http://svn.webkit.org/repository/webkit/trunk@178575 268f45cc-cd09-0410-ab3c-d52691b4dbfc

162 files changed:
ChangeLog
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/JavaScriptCore/DerivedSources.make
Source/JavaScriptCore/inspector/protocol/Database.json
Source/WTF/ChangeLog
Source/WTF/wtf/FeatureDefines.h
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h
Source/WebCore/Modules/webdatabase/ChangeVersionData.h
Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp
Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.h
Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.cpp
Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.h
Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.idl
Source/WebCore/Modules/webdatabase/Database.cpp
Source/WebCore/Modules/webdatabase/Database.h
Source/WebCore/Modules/webdatabase/Database.idl
Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp
Source/WebCore/Modules/webdatabase/DatabaseBackend.h
Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp
Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h
Source/WebCore/Modules/webdatabase/DatabaseBasicTypes.h
Source/WebCore/Modules/webdatabase/DatabaseCallback.h
Source/WebCore/Modules/webdatabase/DatabaseCallback.idl
Source/WebCore/Modules/webdatabase/DatabaseContext.cpp
Source/WebCore/Modules/webdatabase/DatabaseContext.h
Source/WebCore/Modules/webdatabase/DatabaseDetails.h
Source/WebCore/Modules/webdatabase/DatabaseError.h
Source/WebCore/Modules/webdatabase/DatabaseManager.cpp
Source/WebCore/Modules/webdatabase/DatabaseManager.h
Source/WebCore/Modules/webdatabase/DatabaseManagerClient.h
Source/WebCore/Modules/webdatabase/DatabaseServer.cpp
Source/WebCore/Modules/webdatabase/DatabaseServer.h
Source/WebCore/Modules/webdatabase/DatabaseTask.cpp
Source/WebCore/Modules/webdatabase/DatabaseTask.h
Source/WebCore/Modules/webdatabase/DatabaseThread.cpp
Source/WebCore/Modules/webdatabase/DatabaseThread.h
Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp
Source/WebCore/Modules/webdatabase/DatabaseTracker.h
Source/WebCore/Modules/webdatabase/OriginLock.cpp
Source/WebCore/Modules/webdatabase/OriginLock.h
Source/WebCore/Modules/webdatabase/SQLCallbackWrapper.h
Source/WebCore/Modules/webdatabase/SQLError.h
Source/WebCore/Modules/webdatabase/SQLError.idl
Source/WebCore/Modules/webdatabase/SQLException.cpp
Source/WebCore/Modules/webdatabase/SQLException.h
Source/WebCore/Modules/webdatabase/SQLException.idl
Source/WebCore/Modules/webdatabase/SQLResultSet.cpp
Source/WebCore/Modules/webdatabase/SQLResultSet.h
Source/WebCore/Modules/webdatabase/SQLResultSet.idl
Source/WebCore/Modules/webdatabase/SQLResultSetRowList.cpp
Source/WebCore/Modules/webdatabase/SQLResultSetRowList.h
Source/WebCore/Modules/webdatabase/SQLResultSetRowList.idl
Source/WebCore/Modules/webdatabase/SQLStatement.cpp
Source/WebCore/Modules/webdatabase/SQLStatement.h
Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp
Source/WebCore/Modules/webdatabase/SQLStatementBackend.h
Source/WebCore/Modules/webdatabase/SQLStatementCallback.h
Source/WebCore/Modules/webdatabase/SQLStatementCallback.idl
Source/WebCore/Modules/webdatabase/SQLStatementErrorCallback.h
Source/WebCore/Modules/webdatabase/SQLStatementErrorCallback.idl
Source/WebCore/Modules/webdatabase/SQLTransaction.cpp
Source/WebCore/Modules/webdatabase/SQLTransaction.h
Source/WebCore/Modules/webdatabase/SQLTransaction.idl
Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp
Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h
Source/WebCore/Modules/webdatabase/SQLTransactionCallback.h
Source/WebCore/Modules/webdatabase/SQLTransactionCallback.idl
Source/WebCore/Modules/webdatabase/SQLTransactionClient.cpp
Source/WebCore/Modules/webdatabase/SQLTransactionClient.h
Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.cpp
Source/WebCore/Modules/webdatabase/SQLTransactionCoordinator.h
Source/WebCore/Modules/webdatabase/SQLTransactionErrorCallback.h
Source/WebCore/Modules/webdatabase/SQLTransactionErrorCallback.idl
Source/WebCore/Modules/webdatabase/SQLTransactionState.h
Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.cpp
Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h
Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp
Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp
Source/WebCore/bindings/js/JSExceptionBase.cpp
Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp
Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h
Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp
Source/WebCore/bindings/scripts/test/JS/JSTestCallback.h
Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm
Source/WebCore/bindings/scripts/test/TestCallback.idl
Source/WebCore/dom/DOMExceptions.in
Source/WebCore/dom/ScriptExecutionContext.cpp
Source/WebCore/dom/ScriptExecutionContext.h
Source/WebCore/history/PageCache.cpp
Source/WebCore/inspector/CommandLineAPIHost.cpp
Source/WebCore/inspector/CommandLineAPIHost.h
Source/WebCore/inspector/InspectorController.cpp
Source/WebCore/inspector/InspectorDatabaseAgent.cpp
Source/WebCore/inspector/InspectorDatabaseAgent.h
Source/WebCore/inspector/InspectorDatabaseInstrumentation.h
Source/WebCore/inspector/InspectorDatabaseResource.cpp
Source/WebCore/inspector/InspectorDatabaseResource.h
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InspectorInstrumentation.h
Source/WebCore/inspector/InstrumentingAgents.cpp
Source/WebCore/inspector/InstrumentingAgents.h
Source/WebCore/inspector/WorkerInspectorController.cpp
Source/WebCore/loader/EmptyClients.h
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/page/ChromeClient.h
Source/WebCore/platform/FeatureCounterKeys.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit/mac/Storage/WebDatabaseManager.mm
Source/WebKit/mac/Storage/WebDatabaseManagerClient.h
Source/WebKit/mac/Storage/WebDatabaseManagerClient.mm
Source/WebKit/mac/Storage/WebDatabaseManagerInternal.h
Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h
Source/WebKit/mac/Storage/WebDatabaseQuotaManager.mm
Source/WebKit/mac/WebCoreSupport/WebChromeClient.h
Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
Source/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm
Source/WebKit/mac/WebView/WebFrame.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/win/ChangeLog
Source/WebKit/win/ForEachCoClass.h
Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp
Source/WebKit/win/WebCoreSupport/WebChromeClient.h
Source/WebKit/win/WebDatabaseManager.cpp
Source/WebKit/win/WebDatabaseManager.h
Source/WebKit/win/WebSecurityOrigin.cpp
Source/WebKit/win/WebView.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Source/WebKit2/Shared/OriginAndDatabases.cpp
Source/WebKit2/Shared/OriginAndDatabases.h
Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
Source/WebKit2/UIProcess/API/C/WKContext.cpp
Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp
Source/WebKit2/UIProcess/API/efl/EwkView.cpp
Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp
Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h
Source/WebKit2/UIProcess/WebDatabaseManagerProxy.messages.in
Source/WebKit2/UIProcess/WebProcessPool.cpp
Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp
Source/WebKit2/UIProcess/efl/PageUIClientEfl.h
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h
Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.messages.in
Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebProcess.cpp
Source/cmake/OptionsMac.cmake
Source/cmake/WebKitFeatures.cmake
Source/cmakeconfig.h.cmake
Tools/ChangeLog
Tools/Scripts/webkitperl/FeatureList.pm

index be09c2e..edf036e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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
index bb43f7c..6b21520 100644 (file)
@@ -1018,6 +1018,7 @@ set(JavaScriptCore_INSPECTOR_DOMAINS
     ${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
@@ -1029,12 +1030,6 @@ set(JavaScriptCore_INSPECTOR_DOMAINS
     ${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
index 72828e1..0151b8d 100644 (file)
@@ -1,3 +1,15 @@
+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
index db75115..d50a355 100644 (file)
@@ -165,7 +165,6 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 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 = ;
@@ -227,4 +226,4 @@ ENABLE_LLINT_C_LOOP = ;
 
 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);
index dc8096c..52421ec 100644 (file)
@@ -119,6 +119,7 @@ INSPECTOR_DOMAINS = \
     $(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 \
@@ -130,10 +131,6 @@ INSPECTOR_DOMAINS = \
     $(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
index 01c6083..b959e0f 100644 (file)
@@ -1,6 +1,5 @@
 {
     "domain": "Database",
-    "featureGuard": "ENABLE(SQL_DATABASE)",
     "availability": "web",
     "types": [
         {
index 735097c..858f3dc 100644 (file)
@@ -1,3 +1,12 @@
+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.
index a0ad9e6..4b05a40 100644 (file)
@@ -665,10 +665,6 @@ the public iOS SDK. We will also need to update the FeatureDefines.xcconfig file
 #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
index 4c6e6f3..0fc73f3 100644 (file)
@@ -1,3 +1,140 @@
+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.
index db75115..d50a355 100644 (file)
@@ -165,7 +165,6 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 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 = ;
@@ -227,4 +226,4 @@ ENABLE_LLINT_C_LOOP = ;
 
 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);
index 352d830..60ed8bf 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef AbstractDatabaseServer_h
 #define AbstractDatabaseServer_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "DatabaseBasicTypes.h"
 #include "DatabaseDetails.h"
 #include "DatabaseError.h"
@@ -82,6 +80,4 @@ protected:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // AbstractDatabaseServer_h
index 2ab1960..a836e37 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef ChangeVersionData_h
 #define ChangeVersionData_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -47,6 +45,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // ChangeVersionData_h
index 5c0e147..24974df 100644 (file)
@@ -28,8 +28,6 @@
 #include "config.h"
 #include "ChangeVersionWrapper.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "Database.h"
 #include "SQLError.h"
 #include <wtf/PassRefPtr.h>
@@ -88,5 +86,3 @@ void ChangeVersionWrapper::handleCommitFailedAfterPostflight(SQLTransactionBacke
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index 8770e38..eec31f2 100644 (file)
@@ -28,8 +28,6 @@
 #ifndef ChangeVersionWrapper_h
 #define ChangeVersionWrapper_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "SQLTransactionBackend.h"
 #include <wtf/Forward.h>
 
@@ -56,6 +54,4 @@ private:
 
 } // namespace WebCore
 
-#endif
-
 #endif // ChangeVersionWrapper_h
index 7eaaaa7..50cd393 100644 (file)
@@ -25,9 +25,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(SQL_DATABASE)
-
 #include "DOMWindowWebDatabase.h"
 
 #include "DOMWindow.h"
@@ -59,5 +56,3 @@ PassRefPtr<Database> DOMWindowWebDatabase::openDatabase(DOMWindow* window, const
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index a6a6afb..fd75534 100644 (file)
@@ -27,7 +27,6 @@
 #ifndef DOMWindowWebDatabase_h
 #define DOMWindowWebDatabase_h
 
-#if ENABLE(SQL_DATABASE)
 #include "ExceptionCode.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -52,6 +51,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // DOMWindowWebDatabase_h
index 5c5ef96..15eb435 100644 (file)
@@ -25,7 +25,6 @@
  */
 
 [
-    Conditional=SQL_DATABASE,
 ] partial interface DOMWindow {
     [RaisesException] Database openDatabase(DOMString name, DOMString version, DOMString displayName, unsigned long estimatedSize, optional DatabaseCallback creationCallback);
 };
index b5b9b13..24dbb39 100644 (file)
@@ -29,8 +29,6 @@
 #include "config.h"
 #include "Database.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "ChangeVersionData.h"
 #include "ChangeVersionWrapper.h"
 #include "DatabaseCallback.h"
@@ -364,5 +362,3 @@ SecurityOrigin* Database::securityOrigin() const
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index 2f17c80..8ce6049 100644 (file)
@@ -29,8 +29,6 @@
 #ifndef Database_h
 #define Database_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "DatabaseBackend.h"
 #include "DatabaseBasicTypes.h"
 #include "DatabaseError.h"
@@ -117,6 +115,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // Database_h
index 68c982a..eae2b02 100644 (file)
@@ -28,7 +28,6 @@
 
 [
     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);
index cc927e7..aafa9d4 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "DatabaseBackend.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "ChangeVersionData.h"
 #include "ChangeVersionWrapper.h"
 #include "Database.h"
@@ -55,5 +53,3 @@ DatabaseBackend::DatabaseBackend(PassRefPtr<DatabaseContext> databaseContext, co
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index 90fded3..5afdfd8 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef DatabaseBackend_h
 #define DatabaseBackend_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "DatabaseBackendBase.h"
 #include <wtf/Deque.h>
 #include <wtf/text/WTFString.h>
@@ -68,6 +66,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // DatabaseBackend_h
index 4893809..a67e706 100644 (file)
@@ -30,8 +30,6 @@
 #include "config.h"
 #include "DatabaseBackendBase.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "Database.h"
 #include "DatabaseAuthorizer.h"
 #include "DatabaseContext.h"
@@ -587,5 +585,3 @@ bool DatabaseBackendBase::isInterrupted()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index 3662f0b..b7ede00 100644 (file)
@@ -30,8 +30,6 @@
 #ifndef DatabaseBackendBase_h
 #define DatabaseBackendBase_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "DatabaseBasicTypes.h"
 #include "DatabaseDetails.h"
 #include "DatabaseError.h"
@@ -134,6 +132,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // DatabaseBackendBase_h
index b5454b1..924c103 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef DatabaseBasicTypes_h
 #define DatabaseBasicTypes_h
 
-#if ENABLE(SQL_DATABASE)
-
 namespace WebCore {
 
 typedef int DatabaseGuid;
@@ -35,6 +33,4 @@ typedef int ExceptionCode;
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // DatabaseBasicTypes_h
index 4ced70c..31020dc 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef DatabaseCallback_h
 #define DatabaseCallback_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <wtf/ThreadSafeRefCounted.h>
 
 namespace WebCore {
@@ -48,6 +46,4 @@ public:
 
 }
 
-#endif
-
 #endif // DatabaseCallback_h
index ff6ea89..f6d1100 100644 (file)
@@ -26,8 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=SQL_DATABASE,
-] callback interface DatabaseCallback {
+callback interface DatabaseCallback {
     boolean handleEvent(Database database);
 };
index 88549a5..e5d9ef9 100644 (file)
@@ -28,8 +28,6 @@
 #include "config.h"
 #include "DatabaseContext.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "Database.h"
@@ -247,5 +245,3 @@ bool DatabaseContext::isContextThread() const
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index ee42bd9..472c4e2 100644 (file)
@@ -28,8 +28,6 @@
 #ifndef DatabaseContext_h
 #define DatabaseContext_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "ActiveDOMObject.h"
 #include <wtf/RefPtr.h>
 #include <wtf/ThreadSafeRefCounted.h>
@@ -94,6 +92,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // DatabaseContext_h
index a07cecb..f90aa5e 100644 (file)
@@ -29,8 +29,6 @@
 #ifndef DatabaseDetails_h
 #define DatabaseDetails_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <thread>
 #include <wtf/text/WTFString.h>
 
@@ -86,6 +84,4 @@ private:
 
 } // namespace WebCore
 
-#endif
-
 #endif // DatabaseDetails_h
index 3611c94..fec2bea 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef DatabaseError_h
 #define DatabaseError_h
 
-#if ENABLE(SQL_DATABASE)
-
 namespace WebCore {
 
 enum class DatabaseError {
@@ -41,6 +39,4 @@ enum class DatabaseError {
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // DatabaseError_h
index f403c0d..98a79ed 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "DatabaseManager.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "AbstractDatabaseServer.h"
 #include "Database.h"
 #include "DatabaseBackend.h"
@@ -414,5 +412,3 @@ void DatabaseManager::logErrorMessage(ScriptExecutionContext* context, const Str
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index 5969f99..6c4e8c8 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef DatabaseManager_h
 #define DatabaseManager_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "DatabaseBasicTypes.h"
 #include "DatabaseDetails.h"
 #include "DatabaseError.h"
@@ -155,6 +153,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // DatabaseManager_h
index afc69f8..45c9171 100644 (file)
@@ -25,8 +25,6 @@
 #ifndef DatabaseManagerClient_h
 #define DatabaseManagerClient_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <wtf/Forward.h>
 
 namespace WebCore {
@@ -48,6 +46,4 @@ public:
 
 } // namespace WebCore
 
-#endif
-
 #endif // DatabaseManagerClient_h
index b466404..aee70fa 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "DatabaseServer.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "Database.h"
 #include "DatabaseBackend.h"
 #include "DatabaseContext.h"
@@ -146,5 +144,3 @@ PassRefPtr<DatabaseBackendBase> DatabaseServer::createDatabase(RefPtr<DatabaseCo
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index 82b0e17..ec670d5 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef DatabaseServer_h
 #define DatabaseServer_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "AbstractDatabaseServer.h"
 
 namespace WebCore {
@@ -69,6 +67,4 @@ protected:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // DatabaseServer_h
index dbd1f6a..385ff9d 100644 (file)
@@ -28,8 +28,6 @@
 #include "config.h"
 #include "DatabaseTask.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "Database.h"
 #include "DatabaseBackend.h"
 #include "Logging.h"
@@ -217,5 +215,3 @@ const char* DatabaseBackend::DatabaseTableNamesTask::debugTaskName() const
 #endif
 
 } // namespace WebCore
-
-#endif
index 88fb801..7d10850 100644 (file)
@@ -28,8 +28,6 @@
 #ifndef DatabaseTask_h
 #define DatabaseTask_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "DatabaseBackend.h"
 #include "DatabaseBasicTypes.h"
 #include "DatabaseError.h"
@@ -197,6 +195,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // DatabaseTask_h
index 8f2a9fe..f264f08 100644 (file)
@@ -29,8 +29,6 @@
 #include "config.h"
 #include "DatabaseThread.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "Database.h"
 #include "DatabaseTask.h"
 #include "Logging.h"
@@ -271,4 +269,3 @@ void DatabaseThread::unscheduleDatabaseTasks(Database* database)
     m_queue.removeIf(predicate);
 }
 } // namespace WebCore
-#endif
index 85d3fbc..8fa7d15 100644 (file)
@@ -28,8 +28,6 @@
 #ifndef DatabaseThread_h
 #define DatabaseThread_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <memory>
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
@@ -100,5 +98,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
 #endif // DatabaseThread_h
index 627bef6..c844fd2 100644 (file)
@@ -29,8 +29,6 @@
 #include "config.h"
 #include "DatabaseTracker.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "Database.h"
@@ -1392,4 +1390,3 @@ void DatabaseTracker::notifyDatabasesChanged(void*)
 
 
 } // namespace WebCore
-#endif
index d62b2a6..428595f 100644 (file)
@@ -29,8 +29,6 @@
 #ifndef DatabaseTracker_h
 #define DatabaseTracker_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "DatabaseDetails.h"
 #include "DatabaseError.h"
 #include "SQLiteDatabase.h"
@@ -189,6 +187,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // DatabaseTracker_h
index b94393a..138025a 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "OriginLock.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "FileSystem.h"
 
 namespace WebCore {
@@ -96,5 +94,3 @@ void OriginLock::deleteLockFile(String originPath)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index 791a56a..52a4987 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef OriginLock_h
 #define OriginLock_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "FileSystem.h"
 #include <wtf/ThreadSafeRefCounted.h>
 #include <wtf/ThreadingPrimitives.h>
@@ -58,6 +56,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // OriginLock_h
index c5b477f..771aef8 100644 (file)
@@ -28,8 +28,6 @@
 #ifndef SQLCallbackWrapper_h
 #define SQLCallbackWrapper_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "ScriptExecutionContext.h"
 #include <wtf/ThreadingPrimitives.h>
 
@@ -102,6 +100,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // SQLCallbackWrapper_h
index 94f2561..22e92f5 100644 (file)
@@ -29,8 +29,6 @@
 #ifndef SQLError_h
 #define SQLError_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <wtf/ThreadSafeRefCounted.h>
 #include <wtf/text/WTFString.h>
 
@@ -70,6 +68,4 @@ private:
 
 }
 
-#endif
-
 #endif // SQLError_h
index e66cf26..4c30a93 100644 (file)
@@ -28,7 +28,6 @@
 
 [
     NoInterfaceObject,
-    Conditional=SQL_DATABASE,
     ImplementationLacksVTable
 ] interface SQLError {
     readonly attribute unsigned long code;
index c578ada..0fcb3ae 100644 (file)
@@ -27,8 +27,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(SQL_DATABASE)
 #include "SQLException.h"
 
 #include "ExceptionCodeDescription.h"
@@ -68,5 +66,3 @@ bool SQLException::initializeDescription(ExceptionCode ec, ExceptionCodeDescript
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index 2531c89..33b2477 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef SQLException_h
 #define SQLException_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "ExceptionBase.h"
 
 namespace WebCore {
@@ -69,6 +67,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // SQLException_h
index 3b6a9c3..3dc160a 100644 (file)
@@ -29,7 +29,6 @@
  */
 
 [
-    Conditional=SQL_DATABASE,
     DoNotCheckConstants,
     ImplementationLacksVTable
 ] exception SQLException {
index 22828ad..bafaa72 100644 (file)
@@ -29,8 +29,6 @@
 #include "config.h"
 #include "SQLResultSet.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "ExceptionCode.h"
 
 namespace WebCore {
@@ -78,5 +76,3 @@ void SQLResultSet::setRowsAffected(int count)
 }
 
 }
-
-#endif
index 0b625ba..2c1f53d 100644 (file)
@@ -29,8 +29,6 @@
 #ifndef SQLResultSet_h
 #define SQLResultSet_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "DatabaseBasicTypes.h"
 #include "SQLResultSetRowList.h"
 #include <wtf/ThreadSafeRefCounted.h>
@@ -61,6 +59,4 @@ private:
 
 } // namespace WebCore
 
-#endif
-
 #endif // SQLResultSet_h
index 8a6e892..8513a24 100644 (file)
@@ -28,7 +28,6 @@
 
 [
     NoInterfaceObject,
-    Conditional=SQL_DATABASE,
     ImplementationLacksVTable
 ] interface SQLResultSet {
     readonly attribute SQLResultSetRowList rows;
index f5a170b..657ae94 100644 (file)
@@ -29,8 +29,6 @@
 #include "config.h"
 #include "SQLResultSetRowList.h"
 
-#if ENABLE(SQL_DATABASE)
-
 namespace WebCore {
 
 unsigned SQLResultSetRowList::length() const
@@ -44,5 +42,3 @@ unsigned SQLResultSetRowList::length() const
 }
 
 }
-
-#endif
index ca6f627..af20d19 100644 (file)
@@ -29,8 +29,6 @@
 #ifndef SQLResultSetRowList_h
 #define SQLResultSetRowList_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include "SQLValue.h"
@@ -59,5 +57,3 @@ private:
 }
 
 #endif
-
-#endif
index 87f8cc4..8694184 100644 (file)
@@ -28,7 +28,6 @@
 
 [
     NoInterfaceObject,
-    Conditional=SQL_DATABASE,
     ImplementationLacksVTable,
 ] interface SQLResultSetRowList {
     readonly attribute unsigned long length;
index d48e623..fcbc5bb 100644 (file)
@@ -28,8 +28,6 @@
 #include "config.h"
 #include "SQLStatement.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "AbstractDatabaseServer.h"
 #include "Database.h"
 #include "DatabaseManager.h"
@@ -92,5 +90,3 @@ bool SQLStatement::performCallback(SQLTransaction* transaction)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index 4bd0754..97a8f92 100644 (file)
@@ -28,8 +28,6 @@
 #ifndef SQLStatement_h
 #define SQLStatement_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "SQLCallbackWrapper.h"
 #include "SQLResultSet.h"
 #include "SQLValue.h"
@@ -69,6 +67,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // SQLStatement_h
index 89d1bbb..fb001df 100644 (file)
@@ -28,8 +28,6 @@
 #include "config.h"
 #include "SQLStatementBackend.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "DatabaseBackend.h"
 #include "Logging.h"
 #include "SQLError.h"
@@ -241,5 +239,3 @@ bool SQLStatementBackend::lastExecutionFailedDueToQuota() const
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index f3e39a3..d01510d 100644 (file)
@@ -28,8 +28,6 @@
 #ifndef SQLStatementBackend_h
 #define SQLStatementBackend_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "SQLValue.h"
 #include <wtf/Forward.h>
 #include <wtf/Vector.h>
@@ -83,6 +81,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // SQLStatementBackend_h
index 5484143..02dee42 100644 (file)
@@ -28,8 +28,6 @@
 #ifndef SQLStatementCallback_h
 #define SQLStatementCallback_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <wtf/ThreadSafeRefCounted.h>
 
 namespace WebCore {
@@ -45,6 +43,4 @@ public:
 
 }
 
-#endif
-
 #endif // SQLStatementErrorCallback_h
index fc28ca0..89cc530 100644 (file)
@@ -26,8 +26,6 @@
  * 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);
 };
index a316964..e2ae8db 100644 (file)
@@ -29,8 +29,6 @@
 #ifndef SQLStatementErrorCallback_h
 #define SQLStatementErrorCallback_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <wtf/ThreadSafeRefCounted.h>
 
 namespace WebCore {
@@ -46,6 +44,4 @@ public:
 
 }
 
-#endif
-
 #endif // SQLStatementErrorCallback_h
index e325c1c..1c841d3 100644 (file)
@@ -26,8 +26,6 @@
  * 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);
 };
index f513191..28d1d5a 100644 (file)
@@ -29,8 +29,6 @@
 #include "config.h"
 #include "SQLTransaction.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "Database.h"
 #include "DatabaseAuthorizer.h"
 #include "DatabaseContext.h"
@@ -295,5 +293,3 @@ void SQLTransaction::clearCallbackWrappers()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index ed94854..bbcd5ea 100644 (file)
@@ -29,8 +29,6 @@
 #ifndef SQLTransaction_h
 #define SQLTransaction_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "SQLCallbackWrapper.h"
 #include "SQLStatement.h"
 #include "SQLTransactionStateMachine.h"
@@ -103,6 +101,4 @@ private:
 
 } // namespace WebCore
 
-#endif
-
 #endif // SQLTransaction_h
index ec4e957..be187d2 100644 (file)
@@ -28,7 +28,6 @@
 
 [
     NoInterfaceObject,
-    Conditional=SQL_DATABASE,
     SkipVTableValidation,
 ] interface SQLTransaction {
     [Custom] void executeSql(DOMString sqlStatement,
index 2ef7c16..d6e2abb 100644 (file)
@@ -29,8 +29,6 @@
 #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"
@@ -852,5 +850,3 @@ void SQLTransactionBackend::releaseOriginLockIfNeeded()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index 8813a2a..1117e1c 100644 (file)
@@ -28,8 +28,6 @@
 #ifndef SQLTransactionBackend_h
 #define SQLTransactionBackend_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "DatabaseBasicTypes.h"
 #include "SQLTransactionStateMachine.h"
 #include <memory>
@@ -139,6 +137,4 @@ private:
 
 } // namespace WebCore
 
-#endif
-
 #endif // SQLTransactionBackend_h
index a307866..14fb096 100644 (file)
@@ -29,8 +29,6 @@
 #ifndef SQLTransactionCallback_h
 #define SQLTransactionCallback_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <wtf/ThreadSafeRefCounted.h>
 
 namespace WebCore {
@@ -45,6 +43,4 @@ public:
 
 }
 
-#endif
-
 #endif // SQLTransactionCallback_h
index cf28551..e6ba17c 100644 (file)
@@ -26,8 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=SQL_DATABASE,
-] callback interface SQLTransactionCallback {
+callback interface SQLTransactionCallback {
     boolean handleEvent(SQLTransaction transaction);
 };
index 443f726..af43d10 100644 (file)
@@ -31,8 +31,6 @@
 #include "config.h"
 #include "SQLTransactionClient.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "DatabaseBackendBase.h"
 #include "DatabaseContext.h"
 #include "DatabaseManager.h"
@@ -58,5 +56,3 @@ bool SQLTransactionClient::didExceedQuota(DatabaseBackendBase* database)
 }
 
 }
-
-#endif // ENABLE(SQL_DATABASE)
index cd65eaf..6172820 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef SQLTransactionClient_h
 #define SQLTransactionClient_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <wtf/FastMalloc.h>
 #include <wtf/Noncopyable.h>
 
@@ -52,6 +50,4 @@ public:
 
 }
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // SQLTransactionClient_h
index 8abc6cf..9f62234 100644 (file)
@@ -32,8 +32,6 @@
 #include "config.h"
 #include "SQLTransactionCoordinator.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "Database.h"
 #include "SQLTransactionBackend.h"
 #include "SecurityOrigin.h"
@@ -151,5 +149,3 @@ void SQLTransactionCoordinator::shutdown()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index ce87e05..4a7ae26 100644 (file)
@@ -32,8 +32,6 @@
 #ifndef SQLTransactionCoordinator_h
 #define SQLTransactionCoordinator_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
@@ -68,6 +66,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // SQLTransactionCoordinator_h
index 272a82c..38f0e4d 100644 (file)
@@ -29,8 +29,6 @@
 #ifndef SQLTransactionErrorCallback_h
 #define SQLTransactionErrorCallback_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <wtf/ThreadSafeRefCounted.h>
 
 namespace WebCore {
@@ -45,6 +43,4 @@ public:
 
 }
 
-#endif
-
 #endif // SQLTransactionErrorCallback_h
index 9af42ed..7071b32 100644 (file)
@@ -26,8 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=SQL_DATABASE,
-] callback interface SQLTransactionErrorCallback {
+callback interface SQLTransactionErrorCallback {
     boolean handleEvent(SQLError error);
 };
index f8a5adf..134756b 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef SQLTransactionState_h
 #define SQLTransactionState_h
 
-#if ENABLE(SQL_DATABASE)
-
 namespace WebCore {
 
 enum class SQLTransactionState {
@@ -49,6 +47,4 @@ enum class SQLTransactionState {
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // SQLTransactionState_h
index 194f862..ccd8940 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "SQLTransactionStateMachine.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "Logging.h"
 #include <wtf/Assertions.h>
 
@@ -70,5 +68,3 @@ const char* nameForSQLTransactionState(SQLTransactionState state)
 #endif
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index fff11a8..20a89d5 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef SQLTransactionStateMachine_h
 #define SQLTransactionStateMachine_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "SQLTransactionState.h"
 #include <wtf/ThreadSafeRefCounted.h>
 
@@ -107,6 +105,4 @@ void SQLTransactionStateMachine<T>::runStateMachine()
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // SQLTransactionStateMachine_h
index 7e86db6..fd49329 100644 (file)
@@ -37,7 +37,9 @@
 #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;
 
@@ -148,11 +146,9 @@ JSValue JSCommandLineAPIHost::databaseId(ExecState* exec)
     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();
 }
index 5520a86..011ff9a 100644 (file)
@@ -27,9 +27,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(SQL_DATABASE)
-
 #include "JSSQLStatementErrorCallback.h"
 
 #include "JSSQLError.h"
@@ -69,5 +66,3 @@ bool JSSQLStatementErrorCallback::handleEvent(SQLTransaction* transaction, SQLEr
 }
 
 }
-
-#endif // ENABLE(SQL_DATABASE)
index a9b639e..a17af56 100644 (file)
 #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 {
 
@@ -53,10 +51,8 @@ ExceptionBase* toExceptionBase(JSC::JSValue value)
         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;
 }
index 84b4c76..3c92beb 100644 (file)
 
 #include "config.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "JSSQLResultSetRowList.h"
-
 #include "ExceptionCode.h"
 #include "JSDOMBinding.h"
 #include "SQLValue.h"
@@ -84,5 +81,3 @@ JSValue JSSQLResultSetRowList::item(ExecState* exec)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index 9bd90e3..bd1a6d8 100644 (file)
 
 #include "config.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "JSSQLTransaction.h"
-
 #include "DOMWindow.h"
 #include "ExceptionCode.h"
 #include "JSSQLStatementCallback.h"
@@ -118,5 +115,3 @@ JSValue JSSQLTransaction::executeSql(ExecState* exec)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
index 905f0fd..8ceccce 100644 (file)
 #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 {
 
@@ -73,16 +73,16 @@ WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback* coreObject)
 
 } // 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);
 }
@@ -90,11 +90,11 @@ static void webkit_dom_test_callback_finalize(GObject* 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;
 }
 
@@ -114,7 +114,7 @@ static void webkit_dom_test_callback_init(WebKitDOMTestCallback* request)
 
 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);
@@ -122,14 +122,14 @@ gboolean webkit_dom_test_callback_callback_with_no_param(WebKitDOMTestCallback*
     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);
@@ -140,14 +140,14 @@ gboolean webkit_dom_test_callback_callback_with_array_param(WebKitDOMTestCallbac
 #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);
@@ -160,14 +160,14 @@ gboolean webkit_dom_test_callback_callback_with_serialized_script_value_param(We
     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);
@@ -178,14 +178,14 @@ glong webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestC
 #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);
@@ -196,14 +196,14 @@ gboolean webkit_dom_test_callback_callback_with_string_list(WebKitDOMTestCallbac
 #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);
@@ -212,14 +212,14 @@ gboolean webkit_dom_test_callback_callback_with_boolean(WebKitDOMTestCallback* s
 #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);
@@ -231,8 +231,8 @@ gboolean webkit_dom_test_callback_callback_requires_this_to_pass(WebKitDOMTestCa
     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) */
 }
 
index f161738..0972388 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "TestCallback.h"
 #include <webkitdom/WebKitDOMTestCallback.h>
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
 
 namespace WebKit {
 WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback*);
@@ -31,6 +31,6 @@ WebKitDOMTestCallback* kit(WebCore::TestCallback*);
 WebCore::TestCallback* core(WebKitDOMTestCallback*);
 } // namespace WebKit
 
-#endif /* ENABLE(SQL_DATABASE) */
+#endif /* ENABLE(SPEECH_SYNTHESIS) */
 
 #endif /* WebKitDOMTestCallbackPrivate_h */
index f1c1fce..410f54c 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
 
 #include "JSTestCallback.h"
 
@@ -168,4 +168,4 @@ bool JSTestCallback::callbackRequiresThisToPass(int longParam, TestNode* testNod
 
 }
 
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(SPEECH_SYNTHESIS)
index be735f9..dc9650d 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef JSTestCallback_h
 #define JSTestCallback_h
 
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
 
 #include "ActiveDOMCallback.h"
 #include "JSCallbackData.h"
@@ -59,6 +59,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(SPEECH_SYNTHESIS)
 
 #endif
index f891c35..bc2cb43 100644 (file)
@@ -26,7 +26,7 @@
 
 #import "config.h"
 
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SPEECH_SYNTHESIS)
 
 #import "DOMInternal.h"
 
@@ -143,4 +143,4 @@ DOMTestCallback *kit(WebCore::TestCallback* value)
     return [wrapper autorelease];
 }
 
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(SPEECH_SYNTHESIS)
index 0629acb..4f520d9 100644 (file)
@@ -29,7 +29,7 @@
 // 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);
index f06ebb3..3dd7a48 100644 (file)
@@ -4,7 +4,7 @@ DOMCoreException
 EventException
 FileException
 RangeException
-SQLException conditional=SQL_DATABASE
+SQLException
 SVGException
 XMLHttpRequestException
 XPathException
index c796845..fc23761 100644 (file)
@@ -30,6 +30,7 @@
 
 #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 {
@@ -459,13 +456,11 @@ JSC::VM& ScriptExecutionContext::vm()
     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
 {
index 5bc7ea2..cf71114 100644 (file)
@@ -171,9 +171,7 @@ public:
 
     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;
@@ -226,9 +224,7 @@ private:
 
     std::unique_ptr<PublicURLManager> m_publicURLManager;
 
-#if ENABLE(SQL_DATABASE)
     RefPtr<DatabaseContext> m_databaseContext;
-#endif
 
     bool m_activeDOMObjectAdditionForbidden;
     int m_timerNestingLevel;
index 5a4c308..9dba497 100644 (file)
@@ -139,13 +139,11 @@ static unsigned logCanCacheFrameDecision(Frame* frame, int indentLevel)
         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);
@@ -314,9 +312,7 @@ bool PageCache::canCachePageContainingThisFrame(Frame* frame)
         && !(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()
index b464da3..f234a87 100644 (file)
@@ -33,6 +33,7 @@
 
 #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 {
@@ -70,9 +67,7 @@ CommandLineAPIHost::CommandLineAPIHost()
     , m_consoleAgent(nullptr)
     , m_domAgent(nullptr)
     , m_domStorageAgent(nullptr)
-#if ENABLE(SQL_DATABASE)
     , m_databaseAgent(nullptr)
-#endif
 {
     m_defaultInspectableObject = std::make_unique<InspectableObject>();
 }
@@ -87,9 +82,7 @@ void CommandLineAPIHost::disconnect()
     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)
@@ -149,14 +142,12 @@ CommandLineAPIHost::InspectableObject* CommandLineAPIHost::inspectedObject(unsig
     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)
 {
index 31e6c62..877ef0b 100644 (file)
@@ -67,18 +67,14 @@ public:
         , 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();
@@ -99,9 +95,7 @@ public:
 
     void getEventListenersImpl(Node*, Vector<EventListenerInfo>& listenersArray);
 
-#if ENABLE(SQL_DATABASE)
     String databaseIdImpl(Database*);
-#endif
     String storageIdImpl(Storage*);
 
 private:
@@ -111,9 +105,7 @@ 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;
index 8bf0f37..0892a20 100644 (file)
@@ -122,11 +122,9 @@ InspectorController::InspectorController(Page& page, InspectorClient* inspectorC
 
     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));
@@ -171,9 +169,7 @@ InspectorController::InspectorController(Page& page, InspectorClient* inspectorC
             , consoleAgent
             , m_domAgent
             , domStorageAgent
-#if ENABLE(SQL_DATABASE)
             , databaseAgent
-#endif
         );
     }
 
index b474983..73daa16 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#if ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
+#if ENABLE(INSPECTOR)
 
 #include "InspectorDatabaseAgent.h"
 
@@ -323,4 +323,4 @@ Database* InspectorDatabaseAgent::databaseForId(const String& databaseId)
 
 } // namespace WebCore
 
-#endif // ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
+#endif // ENABLE(INSPECTOR)
index 38e3f31..443fcd9 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef InspectorDatabaseAgent_h
 #define InspectorDatabaseAgent_h
 
-#if ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
+#if ENABLE(INSPECTOR)
 
 #include "InspectorWebAgentBase.h"
 #include <inspector/InspectorBackendDispatchers.h>
@@ -83,6 +83,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
+#endif // ENABLE(INSPECTOR)
 
 #endif // !defined(InspectorDatabaseAgent_h)
index cdec3ac..bcd2a2d 100644 (file)
@@ -37,7 +37,6 @@
 
 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)
@@ -51,7 +50,6 @@ inline void InspectorInstrumentation::didOpenDatabase(ScriptExecutionContext* co
     UNUSED_PARAM(version);
 #endif
 }
-#endif
 
 } // namespace WebCore
 
index 9baf5ff..8582518 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
+#if ENABLE(INSPECTOR)
 
 #include "InspectorDatabaseResource.h"
 
@@ -70,4 +70,4 @@ void InspectorDatabaseResource::bind(InspectorDatabaseFrontendDispatcher* databa
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
+#endif // ENABLE(INSPECTOR)
index caa68aa..1db8444 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef InspectorDatabaseResource_h
 #define InspectorDatabaseResource_h
 
-#if ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
+#if ENABLE(INSPECTOR)
 
 #include <inspector/InspectorFrontendDispatchers.h>
 #include <wtf/RefCounted.h>
@@ -63,6 +63,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(INSPECTOR)
 
 #endif // InspectorDatabaseResource_h
index 2cf2ee3..0888afb 100644 (file)
@@ -772,10 +772,8 @@ void InspectorInstrumentation::didCommitLoadImpl(InstrumentingAgents& instrument
         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());
@@ -939,7 +937,6 @@ RefPtr<JSC::Profile> InspectorInstrumentation::stopProfilingImpl(InstrumentingAg
     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())
@@ -947,7 +944,6 @@ void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents& instrume
     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)
 {
index eab6b2f..cbed0e0 100644 (file)
@@ -228,9 +228,7 @@ public:
     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*);
 
@@ -418,9 +416,7 @@ private:
     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*);
 
index ea828ec..39f760e 100644 (file)
@@ -61,9 +61,7 @@ InstrumentingAgents::InstrumentingAgents(InspectorEnvironment& environment)
 #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)
@@ -89,9 +87,7 @@ void InstrumentingAgents::reset()
 #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;
index 47225e0..f91a685 100644 (file)
@@ -115,10 +115,8 @@ public:
     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; }
@@ -158,9 +156,7 @@ private:
 #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;
index 0d5b13c..04c8beb 100644 (file)
@@ -103,9 +103,7 @@ WorkerInspectorController::WorkerInspectorController(WorkerGlobalScope& workerGl
             , nullptr
             , nullptr
             , nullptr
-#if ENABLE(SQL_DATABASE)
             , nullptr
-#endif
         );
     }
 }
index 9efa398..6a93f72 100644 (file)
@@ -155,9 +155,7 @@ public:
 
     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 { }
index 92e8446..a898e34 100644 (file)
@@ -494,10 +494,8 @@ void FrameLoader::stopLoading(UnloadEventPolicy unloadEventPolicy)
         // 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.
index 092bd6b..ddc3b5c 100644 (file)
@@ -24,6 +24,7 @@
 
 #include "AXObjectCache.h"
 #include "Cursor.h"
+#include "DatabaseDetails.h"
 #include "DisplayRefreshMonitor.h"
 #include "FocusDirection.h"
 #include "FrameLoader.h"
@@ -53,10 +54,6 @@ class WAKResponder;
 #endif
 #endif
 
-#if ENABLE(SQL_DATABASE)
-#include "DatabaseDetails.h"
-#endif
-
 OBJC_CLASS NSResponder;
 
 namespace WebCore {
@@ -204,9 +201,7 @@ public:
 
     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
index 88839fa..00ae8b6 100644 (file)
@@ -34,9 +34,7 @@ static const char FeatureCounterPageCacheFailureMainDocumentErrorKey[] = "com.ap
 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";
index c0d5f96..83ed51f 100644 (file)
@@ -1,3 +1,33 @@
+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
index db75115..d50a355 100644 (file)
@@ -165,7 +165,6 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 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 = ;
@@ -227,4 +226,4 @@ ENABLE_LLINT_C_LOOP = ;
 
 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);
index 3912f58..9b9483f 100644 (file)
@@ -28,8 +28,6 @@
 
 #import "WebDatabaseManagerPrivate.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #import "WebDatabaseManagerClient.h"
 #import "WebPlatformStrategies.h"
 #import "WebSecurityOriginInternal.h"
@@ -305,5 +303,3 @@ static NSString *databasesDirectoryPath()
     
     return [databasesDirectory stringByStandardizingPath];
 }
-
-#endif
index 403375d..e69624d 100644 (file)
@@ -23,8 +23,6 @@
  * 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 {
@@ -54,5 +52,3 @@ private:
     bool m_isHandlingDeleteDatabaseOriginNotification;
 #endif
 };
-
-#endif
index aa93302..057270b 100644 (file)
@@ -25,8 +25,6 @@
  
 #import "WebDatabaseManagerClient.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #import "WebDatabaseManagerPrivate.h"
 #import "WebSecurityOriginInternal.h"
 #import <wtf/MainThread.h>
@@ -232,5 +230,3 @@ void WebDatabaseManagerClient::databaseOriginsDidChange()
 }
 
 #endif // PLATFORM(IOS)
-
-#endif
index 89b9ce7..43e5558 100644 (file)
@@ -28,8 +28,6 @@
 
 #import "WebDatabaseManagerPrivate.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #if PLATFORM(IOS)
 @interface WebDatabaseManager (WebDatabaseManagerInternal)
 + (void)willBeginFirstTransaction;
@@ -40,5 +38,3 @@
 
 void WebKitSetWebDatabasePaused(bool);
 #endif
-
-#endif
index 677d2f8..9389aa1 100644 (file)
  * 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;
@@ -78,5 +72,3 @@ extern CFStringRef WebDatabaseOriginsDidChangeNotification;
 + (void)scheduleEmptyDatabaseRemoval;
 #endif
 @end
-
-#endif // ENABLE_SQL_DATABASE
index 138830c..c2ac2ae 100644 (file)
@@ -49,20 +49,12 @@ using namespace WebCore;
 
 - (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
@@ -70,9 +62,7 @@ using namespace WebCore;
 // 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
index e5f72af..815268b 100644 (file)
@@ -119,9 +119,7 @@ public:
     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;
 
index 70b0b30..c50bc2a 100644 (file)
@@ -676,8 +676,6 @@ void WebChromeClient::print(Frame* frame)
         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;
@@ -689,8 +687,6 @@ void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& database
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-#endif
-
 void WebChromeClient::reachedMaxAppCacheSize(int64_t spaceNeeded)
 {
     // FIXME: Free some space.
index 2a3eaaa..68832ed 100644 (file)
@@ -179,27 +179,17 @@ using namespace WebCore;
 
 - (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
index 10c9cfd..fdb773a 100644 (file)
@@ -2092,10 +2092,8 @@ static WebFrameLoadType toWebFrameLoadType(FrameLoadType frameLoadType)
     }
     
     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];
     }
index a38809e..75b4586 100644 (file)
@@ -917,7 +917,6 @@ static void WebKitInitializeGamepadProviderIfNecessary()
         // 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());
@@ -925,7 +924,6 @@ static void WebKitInitializeGamepadProviderIfNecessary()
         if ([standardPreferences databasesEnabled])
 #endif
         [WebDatabaseManager sharedWebDatabaseManager];
-#endif
 
 #if PLATFORM(IOS)        
         if ([standardPreferences storageTrackerEnabled])
@@ -2392,9 +2390,7 @@ static bool needsSelfRetainWhileLoadingQuirk()
     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]);
index 4752de4..7aed032 100644 (file)
@@ -1,3 +1,25 @@
+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
index 8fa50a4..dd4fa86 100644 (file)
 
 #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) \
index c9afe19..477887a 100644 (file)
@@ -582,7 +582,6 @@ void WebChromeClient::print(Frame* frame)
         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()));
@@ -618,7 +617,6 @@ void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& database
         }
     }
 }
-#endif
 
 // FIXME: Move this include to the top of the file with the other includes.
 #include "ApplicationCacheStorage.h"
index 2154a4f..3842212 100644 (file)
@@ -112,9 +112,7 @@ public:
 
     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);
index 5e9733a..669f5f9 100644 (file)
@@ -29,8 +29,6 @@
 #include "WebDatabaseManager.h"
 #include "WebKitDLL.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "COMEnumVariant.h"
 #include "COMPropertyBag.h"
 #include "MarshallingHelpers.h"
@@ -427,5 +425,3 @@ void WebKitInitializeWebDatabasesIfNecessary()
 
     initialized = true;
 }
-
-#endif
index 13b3c3d..af5638f 100644 (file)
@@ -29,8 +29,6 @@
 #ifndef WebDatabaseManager_h
 #define WebDatabaseManager_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "WebKit.h"
 #include <WebCore/DatabaseManagerClient.h>
 
@@ -90,5 +88,3 @@ private:
 void WebKitInitializeWebDatabasesIfNecessary();
 
 #endif
-
-#endif
index 6c88454..7dff229 100644 (file)
@@ -123,43 +123,28 @@ HRESULT WebSecurityOrigin::port(/* [retval][out] */ unsigned short* result)
         
 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)
index faa9dbc..51cfbdf 100644 (file)
@@ -2783,9 +2783,7 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame(
         // of the initialization code which may depend on the strategies.
         WebPlatformStrategies::initialize();
 
-#if ENABLE(SQL_DATABASE)
         WebKitInitializeWebDatabasesIfNecessary();
-#endif
         WebKitSetApplicationCachePathIfNecessary();
         Settings::setDefaultMinDOMTimerInterval(0.004);
 
@@ -4956,12 +4954,10 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
         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))
index 166ff14..571d603 100644 (file)
@@ -1,3 +1,61 @@
+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
index db75115..d50a355 100644 (file)
@@ -165,7 +165,6 @@ ENABLE_RESOLUTION_MEDIA_QUERY = ;
 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 = ;
@@ -227,4 +226,4 @@ ENABLE_LLINT_C_LOOP = ;
 
 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);
index 94f49b8..73e9599 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "OriginAndDatabases.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "WebCoreArgumentCoders.h"
 
 using namespace WebCore;
@@ -57,5 +55,3 @@ bool OriginAndDatabases::decode(IPC::ArgumentDecoder& decoder, OriginAndDatabase
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(SQL_DATABASE)
index 487338f..6a3c921 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef OriginAndDatabases_h
 #define OriginAndDatabases_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include <WebCore/DatabaseDetails.h>
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
@@ -51,6 +49,4 @@ struct OriginAndDatabases {
 
 } // namespace WebKit
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // OriginAndDatabases_h
index ca040f6..ab6ea90 100644 (file)
@@ -957,8 +957,6 @@ bool ArgumentCoder<Cookie>::decode(ArgumentDecoder& decoder, Cookie& cookie)
     return true;
 }
 
-
-#if ENABLE(SQL_DATABASE)
 void ArgumentCoder<DatabaseDetails>::encode(ArgumentEncoder& encoder, const DatabaseDetails& details)
 {
     encoder << details.name();
@@ -999,8 +997,6 @@ bool ArgumentCoder<DatabaseDetails>::decode(ArgumentDecoder& decoder, DatabaseDe
     return true;
 }
 
-#endif
-
 #if PLATFORM(IOS)
 
 void ArgumentCoder<Highlight>::encode(ArgumentEncoder& encoder, const Highlight& highlight)
index 9a05e00..12311ae 100644 (file)
 // 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
@@ -422,12 +420,7 @@ WKBatteryManagerRef WKContextGetBatteryManager(WKContextRef contextRef)
 
 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)
index 9ac8f86..8adfd77 100644 (file)
@@ -33,184 +33,102 @@ using namespace WebKit;
 
 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
 }
index 1871f26..ee503a7 100755 (executable)
@@ -1033,7 +1033,6 @@ WKEinaSharedString EwkView::requestJSPromptPopup(const WKEinaSharedString& messa
     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.
@@ -1049,7 +1048,6 @@ unsigned long long EwkView::informDatabaseQuotaReached(const String& databaseNam
 
     return defaultQuota;
 }
-#endif
 
 WebView* EwkView::webView()
 {
index 1772b98..0e02fca 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "WebDatabaseManagerProxy.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "APIArray.h"
 #include "APIDictionary.h"
 #include "APISecurityOrigin.h"
@@ -264,5 +262,3 @@ void WebDatabaseManagerProxy::didModifyDatabase(const String& originIdentifier,
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(SQL_DATABASE)
index 69e4467..bf555f2 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef WebDatabaseManagerProxy_h
 #define WebDatabaseManagerProxy_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "APIObject.h"
 #include "Arguments.h"
 #include "GenericCallback.h"
@@ -100,6 +98,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // DatabaseManagerProxy_h
index b399cab..79d75b9 100644 (file)
 # 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)
index b14082d..67fcbac 100644 (file)
@@ -214,9 +214,7 @@ WebProcessPool::WebProcessPool(WebProcessPoolConfiguration configuration)
     addSupplement<WebMediaCacheManagerProxy>();
     addSupplement<WebNotificationManagerProxy>();
     addSupplement<WebResourceCacheManagerProxy>();
-#if ENABLE(SQL_DATABASE)
     addSupplement<WebDatabaseManagerProxy>();
-#endif
 #if USE(SOUP)
     addSupplement<WebSoupCustomProtocolRequestManager>();
 #endif
index 7a63e71..0110bae 100644 (file)
@@ -74,9 +74,7 @@ PageUIClientEfl::PageUIClientEfl(EwkView* view)
     uiClient.getWindowFrame = getWindowFrame;
     uiClient.setWindowFrame = setWindowFrame;
     uiClient.runBeforeUnloadConfirmPanel = runBeforeUnloadConfirmPanel;
-#if ENABLE(SQL_DATABASE)
     uiClient.exceededDatabaseQuota = exceededDatabaseQuota;
-#endif
     uiClient.runOpenPanel = runOpenPanel;
     uiClient.createNewPage = createNewPage;
 
@@ -200,13 +198,11 @@ bool PageUIClientEfl::runBeforeUnloadConfirmPanel(WKPageRef, WKStringRef message
     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)
 {
index 651cad4..3584892 100644 (file)
@@ -58,9 +58,7 @@ private:
     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*);
 
index d8a8f97..ff0afd9 100644 (file)
@@ -342,20 +342,14 @@ void InjectedBundle::setAsynchronousSpellCheckingEnabled(WebPageGroupProxy* page
 
 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()
index e39dc4a..ea5a398 100644 (file)
@@ -671,7 +671,6 @@ void WebChromeClient::print(Frame* frame)
     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);
@@ -698,8 +697,6 @@ void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& database
 
     dbManager.setQuota(origin, newQuota);
 }
-#endif
-
 
 void WebChromeClient::reachedMaxAppCacheSize(int64_t)
 {
index 1ccb2a3..e9bc08c 100644 (file)
@@ -138,10 +138,8 @@ private:
     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;
index e64a753..af71109 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "WebDatabaseManager.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "OriginAndDatabases.h"
 #include "WebCoreArgumentCoders.h"
 #include "WebDatabaseManagerMessages.h"
@@ -163,5 +161,3 @@ void WebDatabaseManager::dispatchDidModifyDatabase(WebCore::SecurityOrigin* orig
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(SQL_DATABASE)
index 79997a8..a9e6b31 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef WebDatabaseManager_h
 #define WebDatabaseManager_h
 
-#if ENABLE(SQL_DATABASE)
-
 #include "MessageReceiver.h"
 #include "WebProcessSupplement.h"
 #include <WebCore/DatabaseManagerClient.h>
@@ -75,6 +73,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // WebDatabaseManager_h
index b8f92e2..655cbb6 100644 (file)
@@ -20,8 +20,6 @@
 # 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)
@@ -30,5 +28,3 @@ messages -> WebDatabaseManager {
     void DeleteAllDatabases()
     void SetQuotaForOrigin(String originIdentifier, uint64_t quota)
 }
-
-#endif // ENABLE(SQL_DATABASE)
index 8b4a6f0..5497908 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "WebSQLiteDatabaseTracker.h"
 
-#if ENABLE(SQL_DATABASE)
-
 #include "WebProcess.h"
 #include "WebProcessProxyMessages.h"
 #include <WebCore/SQLiteDatabaseTracker.h>
@@ -73,5 +71,3 @@ void WebSQLiteDatabaseTracker::hysteresisUpdated(HysteresisState state)
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(SQL_DATABASE)
index fa0d904..f2d35cc 100644 (file)
@@ -31,8 +31,6 @@
 #include <WebCore/SQLiteDatabaseTrackerClient.h>
 #include <wtf/Noncopyable.h>
 
-#if ENABLE(SQL_DATABASE)
-
 namespace WebKit {
 
 class WebProcess;
@@ -60,6 +58,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(SQL_DATABASE)
-
 #endif // WebSQLiteDatabaseTracker_h
index e5b4447..de4910d 100644 (file)
@@ -2780,9 +2780,7 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
     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()));
index 7f10570..84f36ea 100644 (file)
@@ -43,6 +43,7 @@
 #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"
@@ -198,13 +196,10 @@ WebProcess::WebProcess()
     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>();
index 219aa2f..77b92bd 100644 (file)
@@ -150,7 +150,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOLUTION_MEDIA_QUERY OFF)
 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)
index d9e5d0d..0939788 100644 (file)
@@ -123,7 +123,6 @@ macro(WEBKIT_OPTION_BEGIN)
     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)
index a4536c9..fbf6b2a 100644 (file)
 #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
index c9231fd..2a1c719 100644 (file)
@@ -1,3 +1,12 @@
+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
index 96d6557..4735466 100644 (file)
@@ -117,7 +117,6 @@ my (
     $resourceTimingSupport,
     $scriptedSpeechSupport,
     $seccompFiltersSupport,
-    $sqlDatabaseSupport,
     $styleScopedSupport,
     $subtleCrypto,
     $suidLinuxSandbox,
@@ -361,9 +360,6 @@ my @features = (
     { 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 },