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

Unified Diff: ui/gl/gl_surface_egl.cc

Issue 2471073002: X11: Use CopyFromParent colormap when possible (Reland) (Closed)
Patch Set: Fix segfault in Angle Created 4 years, 1 month 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 | « ui/base/x/x11_util_internal.h ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface_egl.cc
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index 1b82c97888c590d26f12d6cc28d7b792a5aa5cea..20f844dd8fbcaf2341df34820f4e1f639ee16509 100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -149,6 +149,8 @@ EGLDisplay GetPlatformANGLEDisplay(EGLNativeDisplayType native_display,
Visual* visual;
ui::XVisualManager::GetInstance()->ChooseVisualForWindow(
true, &visual, nullptr, nullptr, nullptr);
+ if (visual == CopyFromParent)
Corentin Wallez 2016/11/03 21:16:56 How about making XVisualManager only return CopyFr
+ visual = DefaultVisual(g_display, DefaultScreen(g_display));
display_attribs.push_back(EGL_X11_VISUAL_ID_ANGLE);
display_attribs.push_back(static_cast<EGLint>(XVisualIDFromVisual(visual)));
#endif
« no previous file with comments | « ui/base/x/x11_util_internal.h ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698