Diff
Modified: trunk/ChangeLog (219959 => 219960)
--- trunk/ChangeLog 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/ChangeLog 2017-07-26 20:11:38 UTC (rev 219960)
@@ -1,3 +1,15 @@
+2017-07-26 Brady Eidson <beid...@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 <bb...@apple.com>
Remove WEB_TIMING feature flag
Modified: trunk/Source/WebKit/CMakeLists.txt (219959 => 219960)
--- trunk/Source/WebKit/CMakeLists.txt 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/CMakeLists.txt 2017-07-26 20:11:38 UTC (rev 219960)
@@ -875,18 +875,6 @@
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)
Modified: trunk/Source/WebKit/ChangeLog (219959 => 219960)
--- trunk/Source/WebKit/ChangeLog 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/ChangeLog 2017-07-26 20:11:38 UTC (rev 219960)
@@ -1,5 +1,65 @@
2017-07-26 Brady Eidson <beid...@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 <beid...@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
Modified: trunk/Source/WebKit/DatabaseProcess/DatabaseProcess.cpp (219959 => 219960)
--- trunk/Source/WebKit/DatabaseProcess/DatabaseProcess.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/DatabaseProcess/DatabaseProcess.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -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 @@
#endif
} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit/DatabaseProcess/DatabaseProcess.h (219959 => 219960)
--- trunk/Source/WebKit/DatabaseProcess/DatabaseProcess.h 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/DatabaseProcess/DatabaseProcess.h 2017-07-26 20:11:38 UTC (rev 219960)
@@ -25,8 +25,6 @@
#pragma once
-#if ENABLE(DATABASE_PROCESS)
-
#include "ChildProcess.h"
#include "SandboxExtension.h"
#include <WebCore/IDBBackingStore.h>
@@ -126,5 +124,3 @@
};
} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit/DatabaseProcess/DatabaseProcess.messages.in (219959 => 219960)
--- trunk/Source/WebKit/DatabaseProcess/DatabaseProcess.messages.in 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/DatabaseProcess/DatabaseProcess.messages.in 2017-07-26 20:11:38 UTC (rev 219960)
@@ -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 @@
DidGetSandboxExtensionsForBlobFiles(uint64_t requestID, WebKit::SandboxExtension::HandleArray extensions)
#endif
}
-
-#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.cpp (219959 => 219960)
--- trunk/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -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 @@
} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.h (219959 => 219960)
--- trunk/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.h 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.h 2017-07-26 20:11:38 UTC (rev 219960)
@@ -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 @@
};
} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
-#endif // DatabaseToWebProcessConnection_h
Modified: trunk/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.messages.in (219959 => 219960)
--- trunk/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.messages.in 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.messages.in 2017-07-26 20:11:38 UTC (rev 219960)
@@ -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 @@
RemoveIDBConnectionToServer(uint64_t serverConnectionIdentifier)
#endif
}
-
-#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in (219959 => 219960)
--- trunk/Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in 2017-07-26 20:11:38 UTC (rev 219960)
@@ -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 @@
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)
Modified: trunk/Source/WebKit/DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp (219959 => 219960)
--- trunk/Source/WebKit/DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -26,8 +26,6 @@
#include "config.h"
#include "DatabaseProcessMainUnix.h"
-#if ENABLE(DATABASE_PROCESS)
-
#include "ChildProcessMain.h"
#include "DatabaseProcess.h"
@@ -39,5 +37,3 @@
}
} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit/DatabaseProcess/ios/DatabaseProcessIOS.mm (219959 => 219960)
--- trunk/Source/WebKit/DatabaseProcess/ios/DatabaseProcessIOS.mm 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/DatabaseProcess/ios/DatabaseProcessIOS.mm 2017-07-26 20:11:38 UTC (rev 219960)
@@ -25,7 +25,7 @@
#import "config.h"
-#if PLATFORM(IOS) && ENABLE(DATABASE_PROCESS)
+#if PLATFORM(IOS)
#import "DatabaseProcess.h"
@@ -61,4 +61,4 @@
} // namespace WebKit
-#endif // PLATFORM(IOS) && ENABLE(DATABASE_PROCESS)
+#endif // PLATFORM(IOS)
Modified: trunk/Source/WebKit/DatabaseProcess/mac/DatabaseProcessMac.mm (219959 => 219960)
--- trunk/Source/WebKit/DatabaseProcess/mac/DatabaseProcessMac.mm 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/DatabaseProcess/mac/DatabaseProcessMac.mm 2017-07-26 20:11:38 UTC (rev 219960)
@@ -25,7 +25,7 @@
#import "config.h"
-#if PLATFORM(MAC) && ENABLE(DATABASE_PROCESS)
+#if PLATFORM(MAC)
#import "DatabaseProcess.h"
@@ -61,4 +61,4 @@
} // namespace WebKit
-#endif // PLATFORM(MAC) && ENABLE(DATABASE_PROCESS)
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebKit/DatabaseProcess/unix/DatabaseProcessMainUnix.h (219959 => 219960)
--- trunk/Source/WebKit/DatabaseProcess/unix/DatabaseProcessMainUnix.h 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/DatabaseProcess/unix/DatabaseProcessMainUnix.h 2017-07-26 20:11:38 UTC (rev 219960)
@@ -23,11 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef DatabaseProcessMainUnix_h
-#define DatabaseProcessMainUnix_h
+#pragma once
-#if ENABLE(DATABASE_PROCESS)
-
#include <WebKit/WKBase.h>
namespace WebKit {
@@ -37,7 +34,3 @@
}
} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
-
-#endif // DatabaseProcessMainUnix_h
Modified: trunk/Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.cpp (219959 => 219960)
--- trunk/Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -26,8 +26,6 @@
#include "config.h"
#include "DatabaseProcessCreationParameters.h"
-#if ENABLE(DATABASE_PROCESS)
-
#include "ArgumentCoders.h"
namespace WebKit {
@@ -60,5 +58,3 @@
}
} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.h (219959 => 219960)
--- trunk/Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.h 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.h 2017-07-26 20:11:38 UTC (rev 219960)
@@ -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 @@
};
} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit/Shared/ProcessExecutablePath.h (219959 => 219960)
--- trunk/Source/WebKit/Shared/ProcessExecutablePath.h 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/Shared/ProcessExecutablePath.h 2017-07-26 20:11:38 UTC (rev 219960)
@@ -25,8 +25,7 @@
#include <wtf/text/WTFString.h>
-#ifndef ProcessExecutablePath_h
-#define ProcessExecutablePath_h
+#pragma once
namespace WebKit {
@@ -33,9 +32,6 @@
String executablePathOfWebProcess();
String executablePathOfPluginProcess();
String executablePathOfNetworkProcess();
-#if ENABLE(DATABASE_PROCESS)
String executablePathOfDatabaseProcess();
-#endif
+
}
-
-#endif
Modified: trunk/Source/WebKit/Shared/gtk/ProcessExecutablePathGtk.cpp (219959 => 219960)
--- trunk/Source/WebKit/Shared/gtk/ProcessExecutablePathGtk.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/Shared/gtk/ProcessExecutablePathGtk.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -84,11 +84,9 @@
return findWebKitProcess("WebKitNetworkProcess");
}
-#if ENABLE(DATABASE_PROCESS)
String executablePathOfDatabaseProcess()
{
return findWebKitProcess("WebKitDatabaseProcess");
}
-#endif
} // namespace WebKit
Modified: trunk/Source/WebKit/Shared/wpe/ProcessExecutablePathWPE.cpp (219959 => 219960)
--- trunk/Source/WebKit/Shared/wpe/ProcessExecutablePathWPE.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/Shared/wpe/ProcessExecutablePathWPE.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -77,11 +77,9 @@
return findWebKitProcess("WPENetworkProcess");
}
-#if ENABLE(DATABASE_PROCESS)
String executablePathOfDatabaseProcess()
{
return findWebKitProcess("WPEDatabaseProcess");
}
-#endif
} // namespace WebKit
Modified: trunk/Source/WebKit/UIProcess/ChildProcessProxy.cpp (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/ChildProcessProxy.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/ChildProcessProxy.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -70,11 +70,9 @@
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)
Modified: trunk/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.cpp (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -33,8 +33,6 @@
#include "WebsiteData.h"
#include <WebCore/NotImplemented.h>
-#if ENABLE(DATABASE_PROCESS)
-
using namespace WebCore;
namespace WebKit {
@@ -223,5 +221,3 @@
}
} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.h (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.h 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.h 2017-07-26 20:11:38 UTC (rev 219960)
@@ -23,11 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef DatabaseProcessProxy_h
-#define DatabaseProcessProxy_h
+#pragma once
-#if ENABLE(DATABASE_PROCESS)
-
#include "ChildProcessProxy.h"
#include "ProcessLauncher.h"
#include "WebProcessProxyMessages.h"
@@ -94,7 +91,3 @@
};
} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
-
-#endif // DatabaseProcessProxy_h
Modified: trunk/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.messages.in (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.messages.in 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.messages.in 2017-07-26 20:11:38 UTC (rev 219960)
@@ -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 @@
GetSandboxExtensionsForBlobFiles(uint64_t requestID, Vector<String> paths)
#endif
}
-
-#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h 2017-07-26 20:11:38 UTC (rev 219960)
@@ -51,9 +51,7 @@
Plugin64,
#endif
Network,
-#if ENABLE(DATABASE_PROCESS)
Database,
-#endif
};
struct LaunchOptions {
Modified: trunk/Source/WebKit/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -81,11 +81,9 @@
case ProcessLauncher::ProcessType::Network:
executablePath = executablePathOfNetworkProcess();
break;
-#if ENABLE(DATABASE_PROCESS)
case ProcessLauncher::ProcessType::Database:
executablePath = executablePathOfDatabaseProcess();
break;
-#endif
default:
ASSERT_NOT_REACHED();
return;
Modified: trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2017-07-26 20:11:38 UTC (rev 219960)
@@ -55,10 +55,8 @@
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";
Modified: trunk/Source/WebKit/UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -67,11 +67,9 @@
case ProcessLauncher::ProcessType::Network:
executablePath = executablePathOfNetworkProcess();
break;
-#if ENABLE(DATABASE_PROCESS)
case ProcessLauncher::ProcessType::Database:
executablePath = executablePathOfDatabaseProcess();
break;
-#endif
default:
ASSERT_NOT_REACHED();
return;
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -291,7 +291,6 @@
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 @@
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)
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -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"
@@ -83,11 +85,6 @@
#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 @@
m_networkProcess->getNetworkProcessConnection(WTFMove(reply));
}
-#if ENABLE(DATABASE_PROCESS)
void WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore)
{
// *********
@@ -564,7 +560,6 @@
m_client.databaseProcessDidCrash(this);
m_databaseProcess = nullptr;
}
-#endif
void WebProcessPool::willStartUsingPrivateBrowsing()
{
@@ -1080,14 +1075,10 @@
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::terminateDatabaseProcess()
{
-#if ENABLE(DATABASE_PROCESS)
if (!m_databaseProcess)
return;
m_databaseProcess->terminate();
m_databaseProcess = nullptr;
-#endif
}
void WebProcessPool::terminateNetworkProcess()
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.h 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h 2017-07-26 20:11:38 UTC (rev 219960)
@@ -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"
@@ -53,10 +54,6 @@
#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 @@
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 @@
bool m_canHandleHTTPSServerTrustEvaluation;
bool m_didNetworkProcessCrash;
RefPtr<NetworkProcessProxy> m_networkProcess;
+ RefPtr<DatabaseProcessProxy> m_databaseProcess;
-#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 @@
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>
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -573,12 +573,10 @@
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
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.h (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.h 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.h 2017-07-26 20:11:38 UTC (rev 219960)
@@ -214,9 +214,7 @@
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;
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.messages.in (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.messages.in 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.messages.in 2017-07-26 20:11:38 UTC (rev 219960)
@@ -37,9 +37,7 @@
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()
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (219959 => 219960)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -431,7 +431,6 @@
});
}
-#if ENABLE(DATABASE_PROCESS)
if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
for (auto& processPool : processPools()) {
processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
@@ -442,7 +441,6 @@
});
}
}
-#endif
if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
callbackAggregator->addPendingCallback();
@@ -727,7 +725,6 @@
});
}
-#if ENABLE(DATABASE_PROCESS)
if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
for (auto& processPool : processPools()) {
processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
@@ -738,7 +735,6 @@
});
}
}
-#endif
if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
callbackAggregator->addPendingCallback();
@@ -1006,7 +1002,6 @@
});
}
-#if ENABLE(DATABASE_PROCESS)
if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
for (auto& processPool : processPools()) {
processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
@@ -1017,7 +1012,6 @@
});
}
}
-#endif
if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
HashSet<WebCore::SecurityOriginData> origins;
Modified: trunk/Source/WebKit/WebKit2Prefix.h (219959 => 219960)
--- trunk/Source/WebKit/WebKit2Prefix.h 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/WebKit2Prefix.h 2017-07-26 20:11:38 UTC (rev 219960)
@@ -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
Modified: trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in (219959 => 219960)
--- trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in 2017-07-26 20:11:38 UTC (rev 219960)
@@ -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 @@
DidGetAllDatabaseNames(uint64_t callbackID, Vector<String> databaseNames)
}
-#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+#endif // ENABLE(INDEXED_DATABASE)
Modified: trunk/Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.cpp (219959 => 219960)
--- trunk/Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -31,8 +31,6 @@
#include "WebIDBConnectionToServerMessages.h"
#include "WebProcess.h"
-#if ENABLE(DATABASE_PROCESS)
-
using namespace WebCore;
namespace WebKit {
@@ -93,5 +91,3 @@
#endif
} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.h (219959 => 219960)
--- trunk/Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.h 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.h 2017-07-26 20:11:38 UTC (rev 219960)
@@ -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 @@
};
} // namespace WebKit
-
-#endif // ENABLE(DATABASE_PROCESS)
-#endif // WebToDatabaseProcessConnection_h
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (219959 => 219960)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2017-07-26 20:11:38 UTC (rev 219960)
@@ -64,6 +64,7 @@
#include "WebProcessProxyMessages.h"
#include "WebResourceLoadStatisticsStoreMessages.h"
#include "WebSocketStream.h"
+#include "WebToDatabaseProcessConnection.h"
#include "WebsiteData.h"
#include "WebsiteDataType.h"
#include <_javascript_Core/JSLock.h>
@@ -126,10 +127,6 @@
#include "SecItemShim.h"
#endif
-#if ENABLE(DATABASE_PROCESS)
-#include "WebToDatabaseProcessConnection.h"
-#endif
-
#if ENABLE(NOTIFICATIONS)
#include "WebNotificationManager.h"
#endif
@@ -1139,7 +1136,6 @@
return m_webLoaderStrategy;
}
-#if ENABLE(DATABASE_PROCESS)
void WebProcess::webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection* connection)
{
ASSERT(m_webToDatabaseProcessConnection);
@@ -1179,8 +1175,6 @@
m_webToDatabaseProcessConnection = WebToDatabaseProcessConnection::create(connectionIdentifier);
}
-#endif // ENABLED(DATABASE_PROCESS)
-
void WebProcess::setEnhancedAccessibility(bool flag)
{
WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility(flag);
Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (219959 => 219960)
--- trunk/Source/WebKit/WebProcess/WebProcess.h 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h 2017-07-26 20:11:38 UTC (rev 219960)
@@ -86,6 +86,7 @@
class WebPage;
class WebPageGroupProxy;
class WebProcessSupplement;
+class WebToDatabaseProcessConnection;
enum class WebsiteDataType;
struct WebPageCreationParameters;
struct WebPageGroupData;
@@ -94,10 +95,6 @@
struct WebsiteData;
struct WebsiteDataStoreParameters;
-#if ENABLE(DATABASE_PROCESS)
-class WebToDatabaseProcessConnection;
-#endif
-
class WebProcess : public ChildProcess {
public:
static WebProcess& singleton();
@@ -167,10 +164,8 @@
LibWebRTCNetwork& libWebRTCNetwork();
#endif
-#if ENABLE(DATABASE_PROCESS)
void webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection*);
WebToDatabaseProcessConnection* webToDatabaseProcessConnection();
-#endif
void setCacheModel(uint32_t);
@@ -388,10 +383,8 @@
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;
Modified: trunk/Source/cmake/OptionsGTK.cmake (219959 => 219960)
--- trunk/Source/cmake/OptionsGTK.cmake 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-07-26 20:11:38 UTC (rev 219960)
@@ -155,7 +155,6 @@
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)
Modified: trunk/Source/cmake/OptionsMac.cmake (219959 => 219960)
--- trunk/Source/cmake/OptionsMac.cmake 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/cmake/OptionsMac.cmake 2017-07-26 20:11:38 UTC (rev 219960)
@@ -105,7 +105,6 @@
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()
Modified: trunk/Source/cmake/OptionsWPE.cmake (219959 => 219960)
--- trunk/Source/cmake/OptionsWPE.cmake 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/cmake/OptionsWPE.cmake 2017-07-26 20:11:38 UTC (rev 219960)
@@ -15,7 +15,6 @@
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)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (219959 => 219960)
--- trunk/Source/cmake/WebKitFeatures.cmake 2017-07-26 20:08:31 UTC (rev 219959)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2017-07-26 20:11:38 UTC (rev 219960)
@@ -99,7 +99,6 @@
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)
