diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-17 17:51:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-28 19:03:32 +0000 |
| commit | e63b35763907304089d961bc3e284178d36c69a3 (patch) | |
| tree | e3fe946240ddfe6b29ce5b72dd16a1db6855f4f1 /src/core/web_engine_context.cpp | |
| parent | 5e66cbc85a350616070a318f917cb181313c4afa (diff) | |
Adaptations for Chromium 70
Change-Id: I8bb77784dbc8a0b9debd96a4c49421bd34e6a0df
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 1ad18b3ea..f0aef72ee 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -46,6 +46,7 @@ #include "base/files/file_path.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" +#include "base/task/post_task.h" #include "base/threading/thread_restrictions.h" #include "cc/base/switches.h" #if QT_CONFIG(webengine_printing_and_pdf) @@ -53,10 +54,12 @@ #endif #include "components/viz/common/features.h" #include "components/web_cache/browser/web_cache_manager.h" +#include "content/browser/browser_thread_impl.h" #include "content/browser/devtools/devtools_http_handler.h" #include "content/public/app/content_main.h" #include "content/public/app/content_main_runner.h" #include "content/public/browser/browser_main_runner.h" +#include "content/public/browser/browser_task_traits.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" @@ -355,6 +358,7 @@ WebEngineContext::WebEngineContext() void WebEngineContext::initialize() { base::TaskScheduler::Create("Browser"); + content::BrowserThreadImpl::CreateTaskExecutor(); m_contentRunner.reset(content::ContentMainRunner::Create()); m_browserRunner.reset(content::BrowserMainRunner::Create()); #ifdef Q_OS_LINUX @@ -467,8 +471,6 @@ void WebEngineContext::initialize() appendToFeatureSwitch(parsedCommandLine, switches::kDisableFeatures, features::kEnableSurfaceSynchronization.name); // The video-capture service is not functioning at this moment (since 69) appendToFeatureSwitch(parsedCommandLine, switches::kDisableFeatures, features::kMojoVideoCapture.name); - // We do not yet support the internal video capture API. - appendToFeatureSwitch(parsedCommandLine, switches::kDisableFeatures, features::kUseVideoCaptureApiForDevToolsSnapshots.name); if (useEmbeddedSwitches) { // embedded switches are based on the switches for Android, see content/browser/android/content_startup_flags.cc |