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

Side by Side Diff: ui/base/x/x11_util_internal.h

Issue 2471403002: Revert of X11: Use CopyFromParent colormap when possible (Closed)
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « ui/base/x/x11_util.cc ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef UI_BASE_X_X11_UTIL_INTERNAL_H_ 5 #ifndef UI_BASE_X_X11_UTIL_INTERNAL_H_
6 #define UI_BASE_X_X11_UTIL_INTERNAL_H_ 6 #define UI_BASE_X_X11_UTIL_INTERNAL_H_
7 7
8 // This file declares utility functions for X11 (Linux only). 8 // This file declares utility functions for X11 (Linux only).
9 // 9 //
10 // These functions require the inclusion of the Xlib headers. Since the Xlib 10 // These functions require the inclusion of the Xlib headers. Since the Xlib
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 private: 94 private:
95 Colormap colormap_; 95 Colormap colormap_;
96 }; 96 };
97 97
98 XVisualManager(); 98 XVisualManager();
99 99
100 std::unordered_map<VisualID, std::unique_ptr<XVisualData>> visuals_; 100 std::unordered_map<VisualID, std::unique_ptr<XVisualData>> visuals_;
101 101
102 XDisplay* display_; 102 XDisplay* display_;
103 103
104 VisualID default_visual_id_;
105
106 // The system visual is usually the same as the default visual, but
107 // may not be in general.
108 VisualID system_visual_id_; 104 VisualID system_visual_id_;
109 VisualID transparent_visual_id_; 105 VisualID transparent_visual_id_;
110 106
111 bool using_compositing_wm_; 107 bool using_compositing_wm_;
112 bool using_software_rendering_; 108 bool using_software_rendering_;
113 bool have_gpu_argb_visual_; 109 bool have_gpu_argb_visual_;
114 110
115 DISALLOW_COPY_AND_ASSIGN(XVisualManager); 111 DISALLOW_COPY_AND_ASSIGN(XVisualManager);
116 }; 112 };
117 #endif 113 #endif
118 114
119 } // namespace ui 115 } // namespace ui
120 116
121 #endif // UI_BASE_X_X11_UTIL_INTERNAL_H_ 117 #endif // UI_BASE_X_X11_UTIL_INTERNAL_H_
OLDNEW
« no previous file with comments | « ui/base/x/x11_util.cc ('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