diff options
| -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 |
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 |