Remove DATABASE_PROCESS build flag.
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Jul 2017 20:11:38 +0000 (20:11 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Jul 2017 20:11:38 +0000 (20:11 +0000)
https://bugs.webkit.org/show_bug.cgi?id=174868

Reviewed by Andy Estes.

.:

* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/OptionsWPE.cmake:
* Source/cmake/WebKitFeatures.cmake:

Source/WebKit:

* CMakeLists.txt:
* DatabaseProcess/DatabaseProcess.cpp:
* DatabaseProcess/DatabaseProcess.h:
* DatabaseProcess/DatabaseProcess.messages.in:
* DatabaseProcess/DatabaseToWebProcessConnection.cpp:
* DatabaseProcess/DatabaseToWebProcessConnection.h:
* DatabaseProcess/DatabaseToWebProcessConnection.messages.in:
* DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in:
* DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp:
* DatabaseProcess/ios/DatabaseProcessIOS.mm:
* DatabaseProcess/mac/DatabaseProcessMac.mm:
* DatabaseProcess/unix/DatabaseProcessMainUnix.h:
* Shared/Databases/DatabaseProcessCreationParameters.cpp:
* Shared/Databases/DatabaseProcessCreationParameters.h:
* Shared/ProcessExecutablePath.h:
* Shared/gtk/ProcessExecutablePathGtk.cpp:
(WebKit::executablePathOfDatabaseProcess):
* Shared/wpe/ProcessExecutablePathWPE.cpp:
(WebKit::executablePathOfDatabaseProcess):
* UIProcess/ChildProcessProxy.cpp:
(WebKit::ChildProcessProxy::getLaunchOptions):
* UIProcess/Databases/DatabaseProcessProxy.cpp:
* UIProcess/Databases/DatabaseProcessProxy.h:
* UIProcess/Databases/DatabaseProcessProxy.messages.in:
* UIProcess/Launcher/ProcessLauncher.h:
* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
(WebKit::ProcessLauncher::launchProcess):
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::serviceName):
* UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp:
(WebKit::ProcessLauncher::launchProcess):
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::databaseProcessCrashed):
(WebKit::WebProcessPool::databaseProcessIdentifier):
(WebKit::WebProcessPool::terminateDatabaseProcess):
* UIProcess/WebProcessPool.h:
(WebKit::WebProcessPool::sendToDatabaseProcessRelaunchingIfNecessary):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::getDatabaseProcessConnection):
* UIProcess/WebProcessProxy.h:
* UIProcess/WebProcessProxy.messages.in:
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::fetchDataAndApply):
(WebKit::WebsiteDataStore::removeData):
* WebKit2Prefix.h:
* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in:
* WebProcess/Databases/WebToDatabaseProcessConnection.cpp:
* WebProcess/Databases/WebToDatabaseProcessConnection.h:
* WebProcess/WebProcess.cpp:
* WebProcess/WebProcess.h:

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

44 files changed:
ChangeLog
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Source/WebKit/DatabaseProcess/DatabaseProcess.cpp
Source/WebKit/DatabaseProcess/DatabaseProcess.h
Source/WebKit/DatabaseProcess/DatabaseProcess.messages.in
Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.cpp
Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.h
Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.messages.in
Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in
Source/WebKit/DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp
Source/WebKit/DatabaseProcess/ios/DatabaseProcessIOS.mm
Source/WebKit/DatabaseProcess/mac/DatabaseProcessMac.mm
Source/WebKit/DatabaseProcess/unix/DatabaseProcessMainUnix.h
Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.cpp
Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.h
Source/WebKit/Shared/ProcessExecutablePath.h
Source/WebKit/Shared/gtk/ProcessExecutablePathGtk.cpp
Source/WebKit/Shared/wpe/ProcessExecutablePathWPE.cpp
Source/WebKit/UIProcess/ChildProcessProxy.cpp
Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.cpp
Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.h
Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.messages.in
Source/WebKit/UIProcess/Launcher/ProcessLauncher.h
Source/WebKit/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm
Source/WebKit/UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp
Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
Source/WebKit/UIProcess/WebProcessPool.cpp
Source/WebKit/UIProcess/WebProcessPool.h
Source/WebKit/UIProcess/WebProcessProxy.cpp
Source/WebKit/UIProcess/WebProcessProxy.h
Source/WebKit/UIProcess/WebProcessProxy.messages.in
Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
Source/WebKit/WebKit2Prefix.h
Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in
Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.cpp
Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.h
Source/WebKit/WebProcess/WebProcess.cpp
Source/WebKit/WebProcess/WebProcess.h
Source/cmake/OptionsGTK.cmake
Source/cmake/OptionsMac.cmake
Source/cmake/OptionsWPE.cmake
Source/cmake/WebKitFeatures.cmake

index fd76893..5e58df3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2017-07-26  Brady Eidson  <beidson@apple.com>
+
+        Remove DATABASE_PROCESS build flag.
+        https://bugs.webkit.org/show_bug.cgi?id=174868
+
+        Reviewed by Andy Estes.
+
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/OptionsMac.cmake:
+        * Source/cmake/OptionsWPE.cmake:
+        * Source/cmake/WebKitFeatures.cmake:
+
 2017-07-26  Brian Burg  <bburg@apple.com>
 
         Remove WEB_TIMING feature flag
index 6a9ff10..123f4bf 100644 (file)
@@ -875,18 +875,6 @@ if (ENABLE_PLUGIN_PROCESS AND NOT "${PORT}" STREQUAL "Mac")
     endif ()
 endif ()
 
-if (ENABLE_DATABASE_PROCESS AND NOT "${PORT}" STREQUAL "Mac")
-    add_definitions(-DENABLE_DATABASE_PROCESS=1)
-    add_executable(DatabaseProcess ${DatabaseProcess_SOURCES})
-    add_webkit2_prefix_header(DatabaseProcess)
-    target_link_libraries(DatabaseProcess ${DatabaseProcess_LIBRARIES})
-    install(TARGETS DatabaseProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
-
-    if (WebKit2_DatabaseProcess_OUTPUT_NAME)
-        set_target_properties(DatabaseProcess PROPERTIES OUTPUT_NAME ${WebKit2_DatabaseProcess_OUTPUT_NAME})
-    endif ()
-endif ()
-
 if ("${PORT}" STREQUAL "Mac")
     set(_web_xpc_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc/Contents)
     make_directory(${_web_xpc_dir}/MacOS)
index 5e3d40a..6d00863 100644 (file)
@@ -1,5 +1,65 @@
 2017-07-26  Brady Eidson  <beidson@apple.com>
 
+        Remove DATABASE_PROCESS build flag.
+        https://bugs.webkit.org/show_bug.cgi?id=174868
+
+        Reviewed by Andy Estes.
+
+        * CMakeLists.txt:
+        * DatabaseProcess/DatabaseProcess.cpp:
+        * DatabaseProcess/DatabaseProcess.h:
+        * DatabaseProcess/DatabaseProcess.messages.in:
+        * DatabaseProcess/DatabaseToWebProcessConnection.cpp:
+        * DatabaseProcess/DatabaseToWebProcessConnection.h:
+        * DatabaseProcess/DatabaseToWebProcessConnection.messages.in:
+        * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in:
+        * DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp:
+        * DatabaseProcess/ios/DatabaseProcessIOS.mm:
+        * DatabaseProcess/mac/DatabaseProcessMac.mm:
+        * DatabaseProcess/unix/DatabaseProcessMainUnix.h:
+        * Shared/Databases/DatabaseProcessCreationParameters.cpp:
+        * Shared/Databases/DatabaseProcessCreationParameters.h:
+        * Shared/ProcessExecutablePath.h:
+        * Shared/gtk/ProcessExecutablePathGtk.cpp:
+        (WebKit::executablePathOfDatabaseProcess):
+        * Shared/wpe/ProcessExecutablePathWPE.cpp:
+        (WebKit::executablePathOfDatabaseProcess):
+        * UIProcess/ChildProcessProxy.cpp:
+        (WebKit::ChildProcessProxy::getLaunchOptions):
+        * UIProcess/Databases/DatabaseProcessProxy.cpp:
+        * UIProcess/Databases/DatabaseProcessProxy.h:
+        * UIProcess/Databases/DatabaseProcessProxy.messages.in:
+        * UIProcess/Launcher/ProcessLauncher.h:
+        * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+        (WebKit::ProcessLauncher::launchProcess):
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        (WebKit::serviceName):
+        * UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp:
+        (WebKit::ProcessLauncher::launchProcess):
+        * UIProcess/Network/NetworkProcessProxy.cpp:
+        (WebKit::NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::databaseProcessCrashed):
+        (WebKit::WebProcessPool::databaseProcessIdentifier):
+        (WebKit::WebProcessPool::terminateDatabaseProcess):
+        * UIProcess/WebProcessPool.h:
+        (WebKit::WebProcessPool::sendToDatabaseProcessRelaunchingIfNecessary):
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::getDatabaseProcessConnection):
+        * UIProcess/WebProcessProxy.h:
+        * UIProcess/WebProcessProxy.messages.in:
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::fetchDataAndApply):
+        (WebKit::WebsiteDataStore::removeData):
+        * WebKit2Prefix.h:
+        * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in:
+        * WebProcess/Databases/WebToDatabaseProcessConnection.cpp:
+        * WebProcess/Databases/WebToDatabaseProcessConnection.h:
+        * WebProcess/WebProcess.cpp:
+        * WebProcess/WebProcess.h:
+
+2017-07-26  Brady Eidson  <beidson@apple.com>
+
         Add test to verify certain child processes are not launched as a side effect of enabling ResourceLoadStatistics.
         https://bugs.webkit.org/show_bug.cgi?id=174851
 
index 9dfd6bc..6b800eb 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "DatabaseProcess.h"
 
-#if ENABLE(DATABASE_PROCESS)
-
 #include "DatabaseProcessCreationParameters.h"
 #include "DatabaseProcessMessages.h"
 #include "DatabaseProcessProxyMessages.h"
@@ -324,5 +322,3 @@ void DatabaseProcess::initializeSandbox(const ChildProcessInitializationParamete
 #endif
 
 } // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
index 35f73b1..8fdac8b 100644 (file)
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#if ENABLE(DATABASE_PROCESS)
-
 #include "ChildProcess.h"
 #include "SandboxExtension.h"
 #include <WebCore/IDBBackingStore.h>
@@ -126,5 +124,3 @@ private:
 };
 
 } // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
index 79df5c0..6d20c28 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(DATABASE_PROCESS)
-
 messages -> DatabaseProcess LegacyReceiver {
     # Initializes a WebsiteDataStore/Session in the DatabaseProcess with the correct parameters
     InitializeWebsiteDataStore(struct WebKit::DatabaseProcessCreationParameters processCreationParameters)
@@ -37,5 +35,3 @@ messages -> DatabaseProcess LegacyReceiver {
     DidGetSandboxExtensionsForBlobFiles(uint64_t requestID, WebKit::SandboxExtension::HandleArray extensions)
 #endif
 }
-
-#endif // ENABLE(DATABASE_PROCESS)
index fdb1812..9ad6aa2 100644 (file)
@@ -32,8 +32,6 @@
 #include "WebIDBConnectionToClientMessages.h"
 #include <wtf/RunLoop.h>
 
-#if ENABLE(DATABASE_PROCESS)
-
 namespace WebKit {
 
 Ref<DatabaseToWebProcessConnection> DatabaseToWebProcessConnection::create(IPC::Connection::Identifier connectionIdentifier)
@@ -127,5 +125,3 @@ void DatabaseToWebProcessConnection::removeIDBConnectionToServer(uint64_t server
 
 
 } // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
index 9161e97..595a8d3 100644 (file)
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DatabaseToWebProcessConnection_h
-#define DatabaseToWebProcessConnection_h
+#pragma once
 
 #include "Connection.h"
 #include "MessageSender.h"
@@ -32,8 +31,6 @@
 #include <WebCore/SessionID.h>
 #include <wtf/HashMap.h>
 
-#if ENABLE(DATABASE_PROCESS)
-
 namespace WebKit {
 
 class WebIDBConnectionToClient;
@@ -72,6 +69,3 @@ private:
 };
 
 } // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
-#endif // DatabaseToWebProcessConnection_h
index fef0cc5..0e4983c 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(DATABASE_PROCESS)
-
 messages -> DatabaseToWebProcessConnection LegacyReceiver {
 #if ENABLE(INDEXED_DATABASE)
     # Creates a connection for communication with a WebProcess
@@ -29,5 +27,3 @@ messages -> DatabaseToWebProcessConnection LegacyReceiver {
     RemoveIDBConnectionToServer(uint64_t serverConnectionIdentifier)
 #endif
 }
-
-#endif // ENABLE(DATABASE_PROCESS)
index d5a747b..4aab026 100644 (file)
@@ -20,7 +20,7 @@
 # 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(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+#if ENABLE(INDEXED_DATABASE)
 
 messages -> WebIDBConnectionToClient {
     DeleteDatabase(WebCore::IDBRequestData requestData)
@@ -53,4 +53,4 @@ messages -> WebIDBConnectionToClient {
 
     GetAllDatabaseNames(uint64_t serverConnectionIdentifier, struct WebCore::SecurityOriginData topOrigin, struct WebCore::SecurityOriginData openingOrigin, uint64_t callbackID);
 }
-#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+#endif // ENABLE(INDEXED_DATABASE)
index 6e30a36..b2be427 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "DatabaseProcessMainUnix.h"
 
-#if ENABLE(DATABASE_PROCESS)
-
 #include "ChildProcessMain.h"
 #include "DatabaseProcess.h"
 
@@ -39,5 +37,3 @@ int DatabaseProcessMainUnix(int argc, char** argv)
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
index f04eae5..c677cc2 100644 (file)
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#if PLATFORM(IOS) && ENABLE(DATABASE_PROCESS)
+#if PLATFORM(IOS)
 
 #import "DatabaseProcess.h"
 
@@ -61,4 +61,4 @@ void DatabaseProcess::initializeSandbox(const ChildProcessInitializationParamete
 
 } // namespace WebKit
 
-#endif // PLATFORM(IOS) && ENABLE(DATABASE_PROCESS)
+#endif // PLATFORM(IOS)
index 077d1be..06d1597 100644 (file)
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#if PLATFORM(MAC) && ENABLE(DATABASE_PROCESS)
+#if PLATFORM(MAC)
 
 #import "DatabaseProcess.h"
 
@@ -61,4 +61,4 @@ void DatabaseProcess::initializeSandbox(const ChildProcessInitializationParamete
 
 } // namespace WebKit
 
-#endif // PLATFORM(MAC) && ENABLE(DATABASE_PROCESS)
+#endif // PLATFORM(MAC)
index 3675e8d..1d3eba6 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DatabaseProcessMainUnix_h
-#define DatabaseProcessMainUnix_h
-
-#if ENABLE(DATABASE_PROCESS)
+#pragma once
 
 #include <WebKit/WKBase.h>
 
@@ -37,7 +34,3 @@ WK_EXPORT int DatabaseProcessMainUnix(int argc, char** argv);
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
-
-#endif // DatabaseProcessMainUnix_h
index 86b2805..cf0f76a 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "DatabaseProcessCreationParameters.h"
 
-#if ENABLE(DATABASE_PROCESS)
-
 #include "ArgumentCoders.h"
 
 namespace WebKit {
@@ -60,5 +58,3 @@ bool DatabaseProcessCreationParameters::decode(IPC::Decoder& decoder, DatabasePr
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
index 8246309..96f93f8 100644 (file)
@@ -30,8 +30,6 @@
 #include <WebCore/SessionID.h>
 #include <wtf/text/WTFString.h>
 
-#if ENABLE(DATABASE_PROCESS)
-
 namespace IPC {
 class Decoder;
 class Encoder;
@@ -54,5 +52,3 @@ struct DatabaseProcessCreationParameters {
 };
 
 } // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
index b007584..a58a907 100644 (file)
 
 #include <wtf/text/WTFString.h>
 
-#ifndef ProcessExecutablePath_h
-#define ProcessExecutablePath_h
+#pragma once
 
 namespace WebKit {
 
 String executablePathOfWebProcess();
 String executablePathOfPluginProcess();
 String executablePathOfNetworkProcess();
-#if ENABLE(DATABASE_PROCESS)
 String executablePathOfDatabaseProcess();
-#endif
-}
 
-#endif
+}
index f0aa966..f38e1ce 100644 (file)
@@ -84,11 +84,9 @@ String executablePathOfNetworkProcess()
     return findWebKitProcess("WebKitNetworkProcess");
 }
 
-#if ENABLE(DATABASE_PROCESS)
 String executablePathOfDatabaseProcess()
 {
     return findWebKitProcess("WebKitDatabaseProcess");
 }
-#endif
 
 } // namespace WebKit
index d87a927..9ef4629 100644 (file)
@@ -77,11 +77,9 @@ String executablePathOfNetworkProcess()
     return findWebKitProcess("WPENetworkProcess");
 }
 
-#if ENABLE(DATABASE_PROCESS)
 String executablePathOfDatabaseProcess()
 {
     return findWebKitProcess("WPEDatabaseProcess");
 }
-#endif
 
 } // namespace WebKit
index 652c602..fef7680 100644 (file)
@@ -70,11 +70,9 @@ void ChildProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchO
     case ProcessLauncher::ProcessType::Network:
         varname = "NETWORK_PROCESS_CMD_PREFIX";
         break;
-#if ENABLE(DATABASE_PROCESS)
     case ProcessLauncher::ProcessType::Database:
         varname = "DATABASE_PROCESS_CMD_PREFIX";
         break;
-#endif
     }
     const char* processCmdPrefix = getenv(varname);
     if (processCmdPrefix && *processCmdPrefix)
index 967c249..6beb7ef 100644 (file)
@@ -33,8 +33,6 @@
 #include "WebsiteData.h"
 #include <WebCore/NotImplemented.h>
 
-#if ENABLE(DATABASE_PROCESS)
-
 using namespace WebCore;
 
 namespace WebKit {
@@ -223,5 +221,3 @@ void DatabaseProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Co
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
index 5299765..13d5c2d 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DatabaseProcessProxy_h
-#define DatabaseProcessProxy_h
-
-#if ENABLE(DATABASE_PROCESS)
+#pragma once
 
 #include "ChildProcessProxy.h"
 #include "ProcessLauncher.h"
@@ -94,7 +91,3 @@ private:
 };
 
 } // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
-
-#endif // DatabaseProcessProxy_h
index 55f73f7..d444bf8 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(DATABASE_PROCESS)
-
 messages -> DatabaseProcessProxy LegacyReceiver {
     DidCreateDatabaseToWebProcessConnection(IPC::Attachment connectionIdentifier)
 
@@ -33,5 +31,3 @@ messages -> DatabaseProcessProxy LegacyReceiver {
     GetSandboxExtensionsForBlobFiles(uint64_t requestID, Vector<String> paths)
 #endif
 }
-
-#endif // ENABLE(DATABASE_PROCESS)
index ba77c2a..8a56246 100644 (file)
@@ -51,9 +51,7 @@ public:
         Plugin64,
 #endif
         Network,
-#if ENABLE(DATABASE_PROCESS)
         Database,
-#endif
     };
 
     struct LaunchOptions {
index add1479..6ed4950 100644 (file)
@@ -81,11 +81,9 @@ void ProcessLauncher::launchProcess()
     case ProcessLauncher::ProcessType::Network:
         executablePath = executablePathOfNetworkProcess();
         break;
-#if ENABLE(DATABASE_PROCESS)
     case ProcessLauncher::ProcessType::Database:
         executablePath = executablePathOfDatabaseProcess();
         break;
-#endif
     default:
         ASSERT_NOT_REACHED();
         return;
index c7eb829..b9efc04 100644 (file)
@@ -55,10 +55,8 @@ static const char* serviceName(const ProcessLauncher::LaunchOptions& launchOptio
         return "com.apple.WebKit.WebContent";
     case ProcessLauncher::ProcessType::Network:
         return "com.apple.WebKit.Networking";
-#if ENABLE(DATABASE_PROCESS)
     case ProcessLauncher::ProcessType::Database:
         return "com.apple.WebKit.Databases";
-#endif
 #if ENABLE(NETSCAPE_PLUGIN_API)
     case ProcessLauncher::ProcessType::Plugin32:
         return "com.apple.WebKit.Plugin.32";
index 6d46098..5958ab0 100644 (file)
@@ -67,11 +67,9 @@ void ProcessLauncher::launchProcess()
     case ProcessLauncher::ProcessType::Network:
         executablePath = executablePathOfNetworkProcess();
         break;
-#if ENABLE(DATABASE_PROCESS)
     case ProcessLauncher::ProcessType::Database:
         executablePath = executablePathOfDatabaseProcess();
         break;
-#endif
     default:
         ASSERT_NOT_REACHED();
         return;
index 46d4b2b..24c842d 100644 (file)
@@ -291,7 +291,6 @@ void NetworkProcessProxy::didDeleteWebsiteDataForOrigins(uint64_t callbackID)
 
 void NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID, const Vector<String>& paths)
 {
-#if ENABLE(DATABASE_PROCESS)
 #if ENABLE(SANDBOX_EXTENSIONS)
     SandboxExtension::HandleArray extensions;
     extensions.allocate(paths.size());
@@ -303,7 +302,6 @@ void NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs(uint64
     m_processPool.sendToDatabaseProcessRelaunchingIfNecessary(Messages::DatabaseProcess::GrantSandboxExtensionsForBlobs(paths, extensions));
 #endif
     connection()->send(Messages::NetworkProcess::DidGrantSandboxExtensionsToDatabaseProcessForBlobs(requestID), 0);
-#endif
 }
 
 void NetworkProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
index 59c68aa..77e746f 100644 (file)
@@ -35,6 +35,8 @@
 #include "APILegacyContextHistoryClient.h"
 #include "APIPageConfiguration.h"
 #include "APIProcessPoolConfiguration.h"
+#include "DatabaseProcessCreationParameters.h"
+#include "DatabaseProcessMessages.h"
 #include "DownloadProxy.h"
 #include "DownloadProxyMessages.h"
 #include "GamepadData.h"
 #include <wtf/RunLoop.h>
 #include <wtf/text/StringBuilder.h>
 
-#if ENABLE(DATABASE_PROCESS)
-#include "DatabaseProcessCreationParameters.h"
-#include "DatabaseProcessMessages.h"
-#endif
-
 #if ENABLE(SERVICE_CONTROLS)
 #include "ServicesController.h"
 #endif
@@ -517,7 +514,6 @@ void WebProcessPool::getNetworkProcessConnection(Ref<Messages::WebProcessProxy::
     m_networkProcess->getNetworkProcessConnection(WTFMove(reply));
 }
 
-#if ENABLE(DATABASE_PROCESS)
 void WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore)
 {
     // *********
@@ -564,7 +560,6 @@ void WebProcessPool::databaseProcessCrashed(DatabaseProcessProxy* databaseProces
     m_client.databaseProcessDidCrash(this);
     m_databaseProcess = nullptr;
 }
-#endif
 
 void WebProcessPool::willStartUsingPrivateBrowsing()
 {
@@ -1080,14 +1075,10 @@ pid_t WebProcessPool::networkProcessIdentifier()
 
 pid_t WebProcessPool::databaseProcessIdentifier()
 {
-#if ENABLE(DATABASE_PROCESS)
     if (!m_databaseProcess)
         return 0;
 
     return m_databaseProcess->processIdentifier();
-#else
-    return 0;
-#endif
 }
 
 void WebProcessPool::setAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText)
@@ -1313,13 +1304,11 @@ void WebProcessPool::clearCachedCredentials()
 
 void WebProcessPool::terminateDatabaseProcess()
 {
-#if ENABLE(DATABASE_PROCESS)
     if (!m_databaseProcess)
         return;
 
     m_databaseProcess->terminate();
     m_databaseProcess = nullptr;
-#endif
 }
 
 void WebProcessPool::terminateNetworkProcess()
index eee672b..8668cc4 100644 (file)
@@ -29,6 +29,7 @@
 #include "APIObject.h"
 #include "APIProcessPoolConfiguration.h"
 #include "APIWebsiteDataStore.h"
+#include "DatabaseProcessProxy.h"
 #include "DownloadProxyMap.h"
 #include "GenericCallback.h"
 #include "HiddenPageThrottlingAutoIncreasesCounter.h"
 #include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
 
-#if ENABLE(DATABASE_PROCESS)
-#include "DatabaseProcessProxy.h"
-#endif
-
 #if ENABLE(MEDIA_SESSION)
 #include "WebMediaSessionFocusManager.h"
 #endif
@@ -315,12 +312,10 @@ public:
 
     void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
 
-#if ENABLE(DATABASE_PROCESS)
     void ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore);
     DatabaseProcessProxy* databaseProcess() { return m_databaseProcess.get(); }
     void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
     void databaseProcessCrashed(DatabaseProcessProxy*);
-#endif
 
 #if PLATFORM(COCOA)
     bool processSuppressionEnabled() const;
@@ -554,11 +549,8 @@ private:
     bool m_canHandleHTTPSServerTrustEvaluation;
     bool m_didNetworkProcessCrash;
     RefPtr<NetworkProcessProxy> m_networkProcess;
-
-#if ENABLE(DATABASE_PROCESS)
     RefPtr<DatabaseProcessProxy> m_databaseProcess;
-#endif
-    
+
     HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks;
     HashMap<uint64_t, RefPtr<StatisticsRequest>> m_statisticsRequests;
 
@@ -637,12 +629,8 @@ void WebProcessPool::sendToNetworkingProcessRelaunchingIfNecessary(T&& message)
 template<typename T>
 void WebProcessPool::sendToDatabaseProcessRelaunchingIfNecessary(T&& message)
 {
-#if ENABLE(DATABASE_PROCESS)
     ensureDatabaseProcessAndWebsiteDataStore(nullptr);
     m_databaseProcess->send(std::forward<T>(message), 0);
-#else
-    sendToAllProcessesRelaunchingThemIfNecessary(std::forward<T>(message));
-#endif
 }
 
 template<typename T>
index 5561167..3168384 100644 (file)
@@ -573,12 +573,10 @@ void WebProcessProxy::getNetworkProcessConnection(Ref<Messages::WebProcessProxy:
     m_processPool->getNetworkProcessConnection(WTFMove(reply));
 }
 
-#if ENABLE(DATABASE_PROCESS)
 void WebProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
 {
     m_processPool->getDatabaseProcessConnection(WTFMove(reply));
 }
-#endif // ENABLE(DATABASE_PROCESS)
 
 #if !PLATFORM(COCOA)
 bool WebProcessProxy::platformIsBeingDebugged() const
index 5bb36c6..8afebf3 100644 (file)
@@ -214,9 +214,7 @@ private:
     void getPluginProcessConnection(uint64_t pluginProcessToken, Ref<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>&&);
 #endif
     void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
-#if ENABLE(DATABASE_PROCESS)
     void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
-#endif
 
     bool platformIsBeingDebugged() const;
 
index 47e5cd2..1ff7657 100644 (file)
@@ -37,9 +37,7 @@ messages -> WebProcessProxy LegacyReceiver {
     GetPluginProcessConnection(uint64_t pluginProcessToken) -> (IPC::Attachment connectionHandle, bool supportsAsynchronousInitialization) Delayed
 #endif
     GetNetworkProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
-#if ENABLE(DATABASE_PROCESS)
     GetDatabaseProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
-#endif
     ProcessReadyToSuspend()
     DidCancelProcessSuspension()
 
index f640b4e..943b5bb 100644 (file)
@@ -431,7 +431,6 @@ void WebsiteDataStore::fetchDataAndApply(OptionSet<WebsiteDataType> dataTypes, O
         });
     }
 
-#if ENABLE(DATABASE_PROCESS)
     if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
         for (auto& processPool : processPools()) {
             processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
@@ -442,7 +441,6 @@ void WebsiteDataStore::fetchDataAndApply(OptionSet<WebsiteDataType> dataTypes, O
             });
         }
     }
-#endif
 
     if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
         callbackAggregator->addPendingCallback();
@@ -727,7 +725,6 @@ void WebsiteDataStore::removeData(OptionSet<WebsiteDataType> dataTypes, std::chr
         });
     }
 
-#if ENABLE(DATABASE_PROCESS)
     if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
         for (auto& processPool : processPools()) {
             processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
@@ -738,7 +735,6 @@ void WebsiteDataStore::removeData(OptionSet<WebsiteDataType> dataTypes, std::chr
             });
         }
     }
-#endif
 
     if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
         callbackAggregator->addPendingCallback();
@@ -1006,7 +1002,6 @@ void WebsiteDataStore::removeData(OptionSet<WebsiteDataType> dataTypes, const Ve
         });
     }
 
-#if ENABLE(DATABASE_PROCESS)
     if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
         for (auto& processPool : processPools()) {
             processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
@@ -1017,7 +1012,6 @@ void WebsiteDataStore::removeData(OptionSet<WebsiteDataType> dataTypes, const Ve
             });
         }
     }
-#endif
 
     if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
         HashSet<WebCore::SecurityOriginData> origins;
index e2be809..721cbd5 100644 (file)
@@ -36,8 +36,6 @@
 
 #define ENABLE_WEB_PROCESS_SANDBOX 1
 
-#define ENABLE_DATABASE_PROCESS 1
-
 #define ENABLE_MEMORY_SAMPLER 1
 
 #define ENABLE_SHAREABLE_RESOURCE 1
index b701074..8d97e44 100644 (file)
@@ -20,7 +20,7 @@
 # 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(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+#if ENABLE(INDEXED_DATABASE)
 
 messages -> WebIDBConnectionToServer {
     DidDeleteDatabase(WebCore::IDBResultData result)
@@ -50,4 +50,4 @@ messages -> WebIDBConnectionToServer {
     DidGetAllDatabaseNames(uint64_t callbackID, Vector<String> databaseNames)
 }
 
-#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+#endif // ENABLE(INDEXED_DATABASE)
index a3b76d4..ece33d6 100644 (file)
@@ -31,8 +31,6 @@
 #include "WebIDBConnectionToServerMessages.h"
 #include "WebProcess.h"
 
-#if ENABLE(DATABASE_PROCESS)
-
 using namespace WebCore;
 
 namespace WebKit {
@@ -93,5 +91,3 @@ WebIDBConnectionToServer& WebToDatabaseProcessConnection::idbConnectionToServerF
 #endif
 
 } // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
index f36fe91..0f1ca92 100644 (file)
@@ -24,8 +24,7 @@
  *
  */
 
-#ifndef WebToDatabaseProcessConnection_h
-#define WebToDatabaseProcessConnection_h
+#pragma once
 
 #include "Connection.h"
 #include "MessageSender.h"
@@ -33,8 +32,6 @@
 #include <WebCore/SessionID.h>
 #include <wtf/RefCounted.h>
 
-#if ENABLE(DATABASE_PROCESS)
-
 namespace WebCore {
 class SessionID;
 }
@@ -76,6 +73,3 @@ private:
 };
 
 } // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
-#endif // WebToDatabaseProcessConnection_h
index 3ec43b2..258ffe8 100644 (file)
@@ -64,6 +64,7 @@
 #include "WebProcessProxyMessages.h"
 #include "WebResourceLoadStatisticsStoreMessages.h"
 #include "WebSocketStream.h"
+#include "WebToDatabaseProcessConnection.h"
 #include "WebsiteData.h"
 #include "WebsiteDataType.h"
 #include <JavaScriptCore/JSLock.h>
 #include "SecItemShim.h"
 #endif
 
-#if ENABLE(DATABASE_PROCESS)
-#include "WebToDatabaseProcessConnection.h"
-#endif
-
 #if ENABLE(NOTIFICATIONS)
 #include "WebNotificationManager.h"
 #endif
@@ -1139,7 +1136,6 @@ WebLoaderStrategy& WebProcess::webLoaderStrategy()
     return m_webLoaderStrategy;
 }
 
-#if ENABLE(DATABASE_PROCESS)
 void WebProcess::webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection* connection)
 {
     ASSERT(m_webToDatabaseProcessConnection);
@@ -1179,8 +1175,6 @@ void WebProcess::ensureWebToDatabaseProcessConnection()
     m_webToDatabaseProcessConnection = WebToDatabaseProcessConnection::create(connectionIdentifier);
 }
 
-#endif // ENABLED(DATABASE_PROCESS)
-
 void WebProcess::setEnhancedAccessibility(bool flag)
 {
     WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility(flag);
index 06ed104..60d3ed4 100644 (file)
@@ -86,6 +86,7 @@ class WebLoaderStrategy;
 class WebPage;
 class WebPageGroupProxy;
 class WebProcessSupplement;
+class WebToDatabaseProcessConnection;
 enum class WebsiteDataType;
 struct WebPageCreationParameters;
 struct WebPageGroupData;
@@ -94,10 +95,6 @@ struct WebProcessCreationParameters;
 struct WebsiteData;
 struct WebsiteDataStoreParameters;
 
-#if ENABLE(DATABASE_PROCESS)
-class WebToDatabaseProcessConnection;
-#endif
-
 class WebProcess : public ChildProcess {
 public:
     static WebProcess& singleton();
@@ -167,10 +164,8 @@ public:
     LibWebRTCNetwork& libWebRTCNetwork();
 #endif
 
-#if ENABLE(DATABASE_PROCESS)
     void webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection*);
     WebToDatabaseProcessConnection* webToDatabaseProcessConnection();
-#endif
 
     void setCacheModel(uint32_t);
 
@@ -388,10 +383,8 @@ private:
 
     std::unique_ptr<WebAutomationSessionProxy> m_automationSessionProxy;
 
-#if ENABLE(DATABASE_PROCESS)
     void ensureWebToDatabaseProcessConnection();
     RefPtr<WebToDatabaseProcessConnection> m_webToDatabaseProcessConnection;
-#endif
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
     RefPtr<PluginProcessConnectionManager> m_pluginProcessConnectionManager;
index ebbd4b8..cf90b5e 100644 (file)
@@ -155,7 +155,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PATH PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PRIVATE ON)
index a848576..0911524 100644 (file)
@@ -105,7 +105,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_AIRPLAY PRIVATE OFF)
 
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
 
 WEBKIT_OPTION_END()
index 3b329d7..983dc36 100644 (file)
@@ -15,7 +15,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC OFF)
index 6977abc..f7f8e7e 100644 (file)
@@ -99,7 +99,6 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_CURSOR_VISIBILITY "Toggle cursor visibility support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CUSTOM_SCHEME_HANDLER "Toggle Custom Scheme Handler support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_DASHBOARD_SUPPORT "Toggle dashboard support" PRIVATE OFF)
-    WEBKIT_OPTION_DEFINE(ENABLE_DATABASE_PROCESS "Toggle database process support in WebKit2" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_DATACUE_VALUE "Toggle datacue value support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_DATALIST_ELEMENT "Toggle HTML5 datalist support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_DATA_TRANSFER_ITEMS "Toggle HTML5 data transfer items support" PRIVATE OFF)