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

Side by Side Diff: trunk/src/base/message_loop/message_loop.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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 #error Not implemented 177 #error Not implemented
178 #endif 178 #endif
179 179
180 if (type_ == TYPE_UI) { 180 if (type_ == TYPE_UI) {
181 if (message_pump_for_ui_factory_) 181 if (message_pump_for_ui_factory_)
182 pump_.reset(message_pump_for_ui_factory_()); 182 pump_.reset(message_pump_for_ui_factory_());
183 else 183 else
184 pump_.reset(MESSAGE_PUMP_UI); 184 pump_.reset(MESSAGE_PUMP_UI);
185 } else if (type_ == TYPE_IO) { 185 } else if (type_ == TYPE_IO) {
186 pump_.reset(MESSAGE_PUMP_IO); 186 pump_.reset(MESSAGE_PUMP_IO);
187 #if defined(TOOLKIT_GTK)
188 } else if (type_ == TYPE_GPU) {
189 pump_.reset(new MessagePumpX11());
190 #endif
191 #if defined(OS_ANDROID) 187 #if defined(OS_ANDROID)
192 } else if (type_ == TYPE_JAVA) { 188 } else if (type_ == TYPE_JAVA) {
193 pump_.reset(MESSAGE_PUMP_UI); 189 pump_.reset(MESSAGE_PUMP_UI);
194 #endif 190 #endif
195 } else { 191 } else {
196 DCHECK_EQ(TYPE_DEFAULT, type_); 192 DCHECK_EQ(TYPE_DEFAULT, type_);
197 pump_.reset(new MessagePumpDefault()); 193 pump_.reset(new MessagePumpDefault());
198 } 194 }
199 } 195 }
200 196
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 fd, 764 fd,
769 persistent, 765 persistent,
770 mode, 766 mode,
771 controller, 767 controller,
772 delegate); 768 delegate);
773 } 769 }
774 770
775 #endif 771 #endif
776 772
777 } // namespace base 773 } // namespace base
OLDNEW
« no previous file with comments | « trunk/src/base/message_loop/message_loop.h ('k') | trunk/src/base/message_loop/message_pump_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698