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

Unified 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 and cleanup. Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/events/platform/x11/x11_event_source_libevent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_main.cc
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 4e47b7cf25ef56a0ce57f24a248563c971cde3d2..d68ff4afc45e10c63fd1d210912a5fe8c41f3b02 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -185,12 +185,15 @@ int GpuMain(const MainFunctionParams& parameters) {
// create child windows to render to.
base::MessagePumpForGpu::InitFactory();
base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
-#elif defined(OS_LINUX) && defined(USE_X11)
+#elif defined(USE_X11)
// We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX
// and https://crbug.com/326995.
base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
std::unique_ptr<ui::PlatformEventSource> event_source =
ui::PlatformEventSource::CreateDefault();
+#elif defined(USE_OZONE)
piman 2016/09/06 22:17:55 Is it the case that Ozone + X11 doesn't have USE_X
kylechar 2016/09/07 13:47:16 Yep, Ozone X11 has USE_OZONE=1 and USE_X11=0. It'
piman 2016/09/07 17:07:09 Depending on the platform, there are constraints s
kylechar 2016/09/07 21:10:42 Thanks! That makes more sense about the message lo
piman 2016/09/07 21:44:30 I think the important case is that if X11 is not p
kylechar 2016/09/13 19:59:12 That's fair. Added a #define in content/gpu/BUILD.
+ // Ozone X11 needs a UI loop to grab Expose events. https://crbug.com/326995
+ base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
#elif defined(OS_LINUX)
base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT);
piman 2016/09/07 17:07:09 If the answer to the question above is no, this is
kylechar 2016/09/13 19:59:12 Done.
#elif defined(OS_MACOSX)
« no previous file with comments | « no previous file | ui/events/platform/x11/x11_event_source_libevent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698