From 7a5edacc46451ac29af6557975f1638725b21274 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Thu, 10 Aug 2017 11:37:05 +0200 Subject: Fix Renderer and GPU threads on windows These threads are using the UI message loop on Windows per default. This won't work since the UI message loop is handled by Qt and the Renderer and GPU threads won't work with it properly. Force these threads for using the default message loop as they use it on Linux platform. Change-Id: I8b04ba9070912378cf1d13173ddff48e98f9a49b Reviewed-by: Alexandru Croitor --- chromium/content/browser/gpu/gpu_process_host.cc | 2 +- chromium/content/browser/renderer_host/render_process_host_impl.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chromium/content/browser/gpu/gpu_process_host.cc b/chromium/content/browser/gpu/gpu_process_host.cc index 9fee26d23b9..8ed00b672ac 100644 --- a/chromium/content/browser/gpu/gpu_process_host.cc +++ b/chromium/content/browser/gpu/gpu_process_host.cc @@ -768,7 +768,7 @@ bool GpuProcessHost::Init() { process_->child_connection()->service_token()), gpu_preferences)); base::Thread::Options options; -#if defined(OS_WIN) || defined(OS_MACOSX) +#if (defined(OS_WIN) || defined(OS_MACOSX)) && !defined(TOOLKIT_QT) // WGL needs to create its own window and pump messages on it. options.message_loop_type = base::MessageLoop::TYPE_UI; #endif diff --git a/chromium/content/browser/renderer_host/render_process_host_impl.cc b/chromium/content/browser/renderer_host/render_process_host_impl.cc index 3d6fbdd7709..e49d8d0eaa2 100644 --- a/chromium/content/browser/renderer_host/render_process_host_impl.cc +++ b/chromium/content/browser/renderer_host/render_process_host_impl.cc @@ -1632,7 +1632,7 @@ bool RenderProcessHostImpl::Init() { child_connection_->service_token()))); base::Thread::Options options; -#if defined(OS_WIN) && !defined(OS_MACOSX) +#if defined(OS_WIN) && !defined(OS_MACOSX) && !defined(TOOLKIT_QT) // In-process plugins require this to be a UI message loop. options.message_loop_type = base::MessageLoop::TYPE_UI; #else -- cgit v1.2.3