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

Unified Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.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
« ui/gl/gl_surface_egl.cc ('K') | « ui/gl/gl_surface_egl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
index c47052dd8a586d4edc2409ab58d3ba3a383546c9..8550a320597fcfb3523519e2c4417b93961a85f6 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -1376,8 +1376,10 @@ void DesktopWindowTreeHostX11::InitX11Window(
enable_transparent_visuals, &visual, &depth, &colormap,
&use_argb_visual_);
- attribute_mask |= CWColormap;
- swa.colormap = colormap;
+ if (colormap != CopyFromParent) {
+ attribute_mask |= CWColormap;
+ swa.colormap = colormap;
+ }
// x.org will BadMatch if we don't set a border when the depth isn't the
// same as the parent depth.
« ui/gl/gl_surface_egl.cc ('K') | « ui/gl/gl_surface_egl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698