Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Side by Side Diff: trunk/src/content/gpu/gpu_main.cc

Issue 23620042: Revert 222689 "Use an X event loop in the GPU process on Linux." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/chrome/installer/linux/rpm/expected_deps_x86_64 ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdlib.h> 5 #include <stdlib.h>
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <dwmapi.h> 8 #include <dwmapi.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif 10 #endif
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 base::MessageLoop::Type message_loop_type = base::MessageLoop::TYPE_IO; 139 base::MessageLoop::Type message_loop_type = base::MessageLoop::TYPE_IO;
140 #if defined(OS_WIN) 140 #if defined(OS_WIN)
141 // Unless we're running on desktop GL, we don't need a UI message 141 // Unless we're running on desktop GL, we don't need a UI message
142 // loop, so avoid its use to work around apparent problems with some 142 // loop, so avoid its use to work around apparent problems with some
143 // third-party software. 143 // third-party software.
144 if (command_line.HasSwitch(switches::kUseGL) && 144 if (command_line.HasSwitch(switches::kUseGL) &&
145 command_line.GetSwitchValueASCII(switches::kUseGL) == 145 command_line.GetSwitchValueASCII(switches::kUseGL) ==
146 gfx::kGLImplementationDesktopName) { 146 gfx::kGLImplementationDesktopName) {
147 message_loop_type = base::MessageLoop::TYPE_UI; 147 message_loop_type = base::MessageLoop::TYPE_UI;
148 } 148 }
149 #elif defined(TOOLKIT_GTK)
150 message_loop_type = base::MessageLoop::TYPE_GPU;
151 #elif defined(OS_LINUX) 149 #elif defined(OS_LINUX)
152 message_loop_type = base::MessageLoop::TYPE_DEFAULT; 150 message_loop_type = base::MessageLoop::TYPE_DEFAULT;
153 #endif 151 #endif
154 152
155 base::MessageLoop main_message_loop(message_loop_type); 153 base::MessageLoop main_message_loop(message_loop_type);
156 base::PlatformThread::SetName("CrGpuMain"); 154 base::PlatformThread::SetName("CrGpuMain");
157 155
158 // In addition to disabling the watchdog if the command line switch is 156 // In addition to disabling the watchdog if the command line switch is
159 // present, disable the watchdog on valgrind because the code is expected 157 // present, disable the watchdog on valgrind because the code is expected
160 // to run slowly in that case. 158 // to run slowly in that case.
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 return true; 447 return true;
450 } 448 }
451 449
452 return false; 450 return false;
453 } 451 }
454 #endif // defined(OS_WIN) 452 #endif // defined(OS_WIN)
455 453
456 } // namespace. 454 } // namespace.
457 455
458 } // namespace content 456 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/chrome/installer/linux/rpm/expected_deps_x86_64 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698