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

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

Issue 1723303002: Implement GLX for Ozone X11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 8 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
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 <stddef.h> 5 #include <stddef.h>
6 #include <stdlib.h> 6 #include <stdlib.h>
7 7
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 #if defined(OS_WIN) 184 #if defined(OS_WIN)
185 // Use a UI message loop because ANGLE and the desktop GL platform can 185 // Use a UI message loop because ANGLE and the desktop GL platform can
186 // create child windows to render to. 186 // create child windows to render to.
187 base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); 187 base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
188 #elif defined(OS_LINUX) && defined(USE_X11) 188 #elif defined(OS_LINUX) && defined(USE_X11)
189 // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX 189 // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX
190 // and https://crbug.com/326995. 190 // and https://crbug.com/326995.
191 base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); 191 base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
192 std::unique_ptr<ui::PlatformEventSource> event_source = 192 std::unique_ptr<ui::PlatformEventSource> event_source =
193 ui::PlatformEventSource::CreateDefault(); 193 ui::PlatformEventSource::CreateDefault();
194 #elif defined(OS_LINUX) && defined(USE_OZONE)
sadrul 2016/04/19 14:49:49 Do you need defined(OS_LINUX) here?
kylechar 2016/04/19 16:00:20 Umm. I'm not actually sure. I don't think think it
195 // Ozone X11 needs a UI loop to grab Expose events. https://crbug.com/326995
196 base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
194 #elif defined(OS_LINUX) 197 #elif defined(OS_LINUX)
195 base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT); 198 base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT);
196 #elif defined(OS_MACOSX) 199 #elif defined(OS_MACOSX)
197 // This is necessary for CoreAnimation layers hosted in the GPU process to be 200 // This is necessary for CoreAnimation layers hosted in the GPU process to be
198 // drawn. See http://crbug.com/312462. 201 // drawn. See http://crbug.com/312462.
199 std::unique_ptr<base::MessagePump> pump(new base::MessagePumpCFRunLoop()); 202 std::unique_ptr<base::MessagePump> pump(new base::MessagePumpCFRunLoop());
200 base::MessageLoop main_message_loop(std::move(pump)); 203 base::MessageLoop main_message_loop(std::move(pump));
201 #else 204 #else
202 base::MessageLoop main_message_loop(base::MessageLoop::TYPE_IO); 205 base::MessageLoop main_message_loop(base::MessageLoop::TYPE_IO);
203 #endif 206 #endif
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 return true; 587 return true;
585 } 588 }
586 589
587 return false; 590 return false;
588 } 591 }
589 #endif // defined(OS_WIN) 592 #endif // defined(OS_WIN)
590 593
591 } // namespace. 594 } // namespace.
592 595
593 } // namespace content 596 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | ui/events/platform/x11/x11_event_source_libevent.h » ('j') | ui/gl/gl_surface_ozone.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698