Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions Source/WebKit2/DatabaseProcess/wpe/DatabaseProcessMainWPE.cpp
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
#include "config.h"
#include "DatabaseProcessMainUnix.h"

#if ENABLE(DATABASE_PROCESS)

#include "ChildProcessMain.h"
#include "DatabaseProcess.h"

using namespace WebCore;

namespace WebKit {

class DatabaseProcessMain final: public ChildProcessMainBase {
public:
bool platformInitialize() override
{
return true;
}
};

int DatabaseProcessMainUnix(int argc, char** argv)
{
return ChildProcessMain<DatabaseProcess, DatabaseProcessMain>(argc, argv);
}

} // namespace WebKit

#endif // ENABLE(DATABASE_PROCESS)
9 changes: 9 additions & 0 deletions Source/WebKit2/PlatformWPE.cmake
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,11 +20,17 @@ list(APPEND WebProcess_SOURCES
WebProcess/EntryPoint/unix/WebProcessMain.cpp
)

list(APPEND DatabaseProcess_SOURCES
DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp
)

list(APPEND NetworkProcess_SOURCES
NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
)

list(APPEND WebKit2_SOURCES
DatabaseProcess/wpe/DatabaseProcessMainWPE.cpp

NetworkProcess/CustomProtocols/soup/CustomProtocolManagerImpl.cpp
NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp

Expand DownExpand Up@@ -109,6 +115,8 @@ list(APPEND WebKit2_SOURCES
UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp
UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp

UIProcess/Databases/wpe/DatabaseProcessProxyWPE.cpp

UIProcess/Network/soup/NetworkProcessProxySoup.cpp

UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
Expand DownExpand Up@@ -205,6 +213,7 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/platform/graphics/opentype"
"${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
"${WEBCORE_DIR}/platform/network/soup"
"${WEBKIT2_DIR}/DatabaseProcess/unix"
"${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
"${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
"${WEBKIT2_DIR}/NetworkProcess/unix"
Expand Down
5 changes: 5 additions & 0 deletions Source/WebKit2/Shared/wpe/ProcessExecutablePathWPE.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,4 +77,9 @@ String executablePathOfNetworkProcess()
return findWebKitProcess("WPENetworkProcess");
}

String executablePathOfDatabaseProcess()
{
return findWebKitProcess("WPEDatabaseProcess");
}

} // namespace WebKit
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
#include "config.h"
#include "DatabaseProcessProxy.h"

#if ENABLE(DATABASE_PROCESS)

namespace WebKit {

void DatabaseProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions&)
{
}

} // namespace WebKit

#endif // ENABLE(DATABASE_PROCESS)
3 changes: 3 additions & 0 deletions Source/WebKit2/UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,9 @@ void ProcessLauncher::launchProcess()
case ProcessLauncher::ProcessType::Network:
executablePath = executablePathOfNetworkProcess();
break;
case ProcessLauncher::ProcessType::Database:
executablePath = executablePathOfDatabaseProcess();
break;
default:
ASSERT_NOT_REACHED();
return;
Expand Down
1 change: 1 addition & 0 deletions Source/cmake/OptionsWPE.cmake
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ set(WebCore_LIBRARY_TYPE STATIC)
set(WebKit2_OUTPUT_NAME WPEWebKit)
set(WebKit2_WebProcess_OUTPUT_NAME WPEWebProcess)
set(WebKit2_NetworkProcess_OUTPUT_NAME WPENetworkProcess)
set(WebKit2_DatabaseProcess_OUTPUT_NAME WPEDatabaseProcess)

find_package(ICU REQUIRED)
find_package(Threads REQUIRED)
Expand Down