| 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.
|
|
|