diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2018-01-11 05:56:18 +0300 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-11 10:25:26 +0000 |
| commit | 79143ccfc158ec4fffc49eee600d600edb342b16 (patch) | |
| tree | 0e078499d8fe3e8627e3612537e61f2dd1029625 /Source/WebKit2/UIProcess | |
| parent | cb895f50d5c08976c0f5ecbb82e6bd19d9ea090d (diff) | |
Import WebKit commit a8b574fb3cd509a2d3f2a1568ad0a66d1bf0f6e8
Change-Id: I66add69e6d08b74111ec8e7e4401e4d813501206
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/UIProcess')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | 1 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp index 3b84c6dba..b894d7338 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp @@ -407,6 +407,7 @@ void QQuickWebViewPrivate::initialize(WKPageConfigurationRef configurationRef) preferences.setMediaSourceEnabled(false); preferences.setWebGLEnabled(true); preferences.setForceCompositingMode(true); + preferences.setAllowFileAccessFromFileURLs(true); webPageProxy->setURLSchemeHandlerForScheme(QrcSchemeHandler::create(), ASCIILiteral("qrc")); diff --git a/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp b/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp index 53913fa56..51a3ffbba 100644 --- a/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp +++ b/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp @@ -123,6 +123,12 @@ void ProcessLauncher::launchProcess() QByteArray pluginProcessPrefix = qgetenv("QT_WEBKIT2_PP_CMD_PREFIX"); commandLine = commandLine.arg(QLatin1String(pluginProcessPrefix.constData())).arg(QString(executablePathOfPluginProcess())); #endif +#if ENABLE(DATABASE_PROCESS) + } else if (m_launchOptions.processType == ProcessType::Database) { + commandLine = QLatin1String("%1 \"%2\" %3 %4"); + QByteArray processPrefix = qgetenv("QT_WEBKIT2_DP_CMD_PREFIX"); + commandLine = commandLine.arg(QLatin1String(processPrefix.constData())).arg(QString(executablePathOfDatabaseProcess())); +#endif } else { qDebug() << "Unsupported process type" << (int)m_launchOptions.processType; ASSERT_NOT_REACHED(); |