summaryrefslogtreecommitdiff
path: root/chromium/content/browser/browser_main_loop.cc
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2014-05-16 13:34:31 +0200
committerAndras Becsi <andras.becsi@theqtcompany.com>2014-12-09 10:54:27 +0100
commit5d9c49272fcc780ae66355dc8429b26d61a6fc86 (patch)
tree4a9a9783742b581fa4f5617ce3114b4b2f562921 /chromium/content/browser/browser_main_loop.cc
parent1598d3566c7a8eae1f10acc168f7abfce9f133c5 (diff)
downloadqtwebengine-chromium-5d9c49272fcc780ae66355dc8429b26d61a6fc86.tar.gz
<chromium> 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: Andras Becsi <andras.becsi@theqtcompany.com>
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 c7dd81bcf36..af47b77c820 100644
--- a/chromium/content/browser/browser_main_loop.cc
+++ b/chromium/content/browser/browser_main_loop.cc
@@ -680,7 +680,7 @@ int BrowserMainLoop::CreateThreads() {
"BrowserMainLoop::CreateThreads:start",
"Thread", "BrowserThread::FILE");
thread_to_start = &file_thread_;
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
// On Windows, the FILE thread needs to be have a UI message loop
// which pumps messages in such a way that Google Update can
// communicate back to us.