summaryrefslogtreecommitdiff
path: root/chromium/content/browser/browser_main_loop.cc
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2017-08-10 11:37:05 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-08-10 10:34:16 +0000
commit653d19d26000d016fc915444c8323a5fe96de18a (patch)
tree0e2e965db27d344b6336cb4cf89b2ec07604d441 /chromium/content/browser/browser_main_loop.cc
parentc1448e447d49d5ba6578fbd614b5f895753dc7f4 (diff)
downloadqtwebengine-chromium-653d19d26000d016fc915444c8323a5fe96de18a.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/browser/browser_main_loop.cc')
-rw-r--r--chromium/content/browser/browser_main_loop.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/content/browser/browser_main_loop.cc b/chromium/content/browser/browser_main_loop.cc
index 6988bc5e590..871035c755b 100644
--- a/chromium/content/browser/browser_main_loop.cc
+++ b/chromium/content/browser/browser_main_loop.cc
@@ -1126,7 +1126,7 @@ int BrowserMainLoop::CreateThreads() {
LOG(FATAL) << "Failed to start the browser thread: id == " << id;
} else {
scoped_refptr<base::SingleThreadTaskRunner> redirection_task_runner;
-#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. The COM STA task runner provides this service.