summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-18 21:10:23 +0000
committerkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-18 21:10:23 +0000
commit1171ca1025e6b1f4af50a4d516d59138b27e8529 (patch)
treea7c2ed59099b510b7b1655e0072641a638af3c6a
parent2258e8243b5c7e216f2740d5e95256f521c5f212 (diff)
downloadchromium_src-1171ca1025e6b1f4af50a4d516d59138b27e8529.zip
chromium_src-1171ca1025e6b1f4af50a4d516d59138b27e8529.tar.gz
chromium_src-1171ca1025e6b1f4af50a4d516d59138b27e8529.tar.bz2
Merge 143263 - Change GPU process to use IO rather than UI MessageLoop on Mac OS. On this platform, the GPU process does not need to access any on-screen resources.
This is an attempted workaround for http://code.google.com/p/chromium/issues/detail?id=131310 . BUG=131310 TEST=ran WebGL content, Poster Circle, and Flash content on Mac OS X Review URL: https://chromiumcodereview.appspot.com/10581041 TBR=kbr@chromium.org Review URL: https://chromiumcodereview.appspot.com/10808020 git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@147310 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/gpu/gpu_main.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index d1c4a76..5f50539 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -186,12 +186,11 @@ int GpuMain(const content::MainFunctionParams& parameters) {
}
#endif
- MessageLoop::Type message_loop_type = MessageLoop::TYPE_UI;
+ MessageLoop::Type message_loop_type = MessageLoop::TYPE_IO;
#if defined(OS_WIN)
// Unless we're running on desktop GL, we don't need a UI message
// loop, so avoid its use to work around apparent problems with some
// third-party software.
- message_loop_type = MessageLoop::TYPE_IO;
if (command_line.HasSwitch(switches::kUseGL) &&
command_line.GetSwitchValueASCII(switches::kUseGL) ==
gfx::kGLImplementationDesktopName) {