summaryrefslogtreecommitdiff
path: root/chromium/content/renderer/renderer_main.cc
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2014-05-16 13:34:31 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-06-04 18:15:39 +0200
commit660bf670f40c9feba12f038bcc9e4b620b853803 (patch)
tree2d8f164c90e3dcb282f661ece1c24dc241519213 /chromium/content/renderer/renderer_main.cc
parent5beb9a3ceb88fb4c0fa0e57e94b0648dd4b2da4f (diff)
downloadqtwebengine-chromium-660bf670f40c9feba12f038bcc9e4b620b853803.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. Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Change-Id: I8b04ba9070912378cf1d13173ddff48e98f9a49b Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/renderer/renderer_main.cc')
-rw-r--r--chromium/content/renderer/renderer_main.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/content/renderer/renderer_main.cc b/chromium/content/renderer/renderer_main.cc
index f0c16d27815..5330d21a564 100644
--- a/chromium/content/renderer/renderer_main.cc
+++ b/chromium/content/renderer/renderer_main.cc
@@ -161,6 +161,8 @@ int RendererMain(const MainFunctionParams& parameters) {
// As long as we use Cocoa in the renderer (for the forseeable future as of
// now; see http://crbug.com/306348 for info) we need to have a UI loop.
base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
+#elif defined(OS_WIN) && defined(TOOLKIT_QT)
+ base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT);
#else
// The main message loop of the renderer services doesn't have IO or UI tasks,
// unless in-process-plugins is used.