diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2014-05-16 13:34:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-03 10:57:10 +0200 |
| commit | 1fc92789b5d362924ddd0fddd3abc777d47a50d9 (patch) | |
| tree | e2b928a950b778cfd409ac4d98cb9f88dfc4687f /chromium/content | |
| parent | e7ecccf58bebb179f5d7d20fc5f0d9353b7cf71e (diff) | |
| download | qtwebengine-chromium-1fc92789b5d362924ddd0fddd3abc777d47a50d9.tar.gz | |
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 <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/content')
| -rw-r--r-- | chromium/content/browser/browser_main_loop.cc | 2 | ||||
| -rw-r--r-- | chromium/content/browser/gpu/gpu_process_host.cc | 2 | ||||
| -rw-r--r-- | chromium/content/browser/renderer_host/render_process_host_impl.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chromium/content/browser/browser_main_loop.cc b/chromium/content/browser/browser_main_loop.cc index 211afb42d2b..e075ad82fa0 100644 --- a/chromium/content/browser/browser_main_loop.cc +++ b/chromium/content/browser/browser_main_loop.cc @@ -1056,7 +1056,7 @@ int BrowserMainLoop::CreateThreads() { "BrowserMainLoop::CreateThreads:start", "Thread", "BrowserThread::FILE"); -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(TOOLKIT_QT) // On Windows, the FILE thread needs to have a UI message loop which // pumps messages in such a way that Google Update can communicate back // to us. diff --git a/chromium/content/browser/gpu/gpu_process_host.cc b/chromium/content/browser/gpu/gpu_process_host.cc index a3860fed97a..4f9f69fb0f9 100644 --- a/chromium/content/browser/gpu/gpu_process_host.cc +++ b/chromium/content/browser/gpu/gpu_process_host.cc @@ -612,7 +612,7 @@ bool GpuProcessHost::Init() { process_->child_connection()->service_token()), gpu_preferences)); base::Thread::Options options; -#if defined(OS_WIN) +#if defined(OS_WIN) && !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 7346efe052f..6f0c9837065 100644 --- a/chromium/content/browser/renderer_host/render_process_host_impl.cc +++ b/chromium/content/browser/renderer_host/render_process_host_impl.cc @@ -879,7 +879,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 |