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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h

Issue 2329323002: Avoid blocking while mapping an X11 window (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <X11/extensions/shape.h> 10 #include <X11/extensions/shape.h>
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 ::Window xwindow_; 271 ::Window xwindow_;
272 272
273 // The native root window. 273 // The native root window.
274 ::Window x_root_window_; 274 ::Window x_root_window_;
275 275
276 ui::X11AtomCache atom_cache_; 276 ui::X11AtomCache atom_cache_;
277 277
278 // Is the window mapped to the screen? 278 // Is the window mapped to the screen?
279 bool window_mapped_; 279 bool window_mapped_;
280 280
281 // If |wait_for_map_| is true, it means we called MapWindow, but haven't yet
282 // gotten the MapNotify event yet. We use this as part of the calculation for
283 // whether the window is "visible".
284 bool wait_for_map_;
Tom (Use chromium acct) 2016/09/12 22:45:07 Since this cl means we don't wait for maps anymore
dackerman 2016/09/23 14:12:37 How about |is_waiting_for_map_|, |expecting_map_no
Tom (Use chromium acct) 2016/09/23 18:35:48 It does make sense to add the check for wait_for_m
dackerman 2016/09/25 19:45:36 Done.
285
281 // Should we wait for an UnmapNotify before trying to remap the window? 286 // Should we wait for an UnmapNotify before trying to remap the window?
282 // If |wait_for_unmap_| is true, we have sent an XUnmapWindow request to the 287 // If |wait_for_unmap_| is true, we have sent an XUnmapWindow request to the
283 // server and have yet to receive an UnmapNotify. 288 // server and have yet to receive an UnmapNotify.
284 bool wait_for_unmap_; 289 bool wait_for_unmap_;
285 290
286 // The bounds of |xwindow_|. 291 // The bounds of |xwindow_|.
287 gfx::Rect bounds_in_pixels_; 292 gfx::Rect bounds_in_pixels_;
288 293
289 // Whenever the bounds are set, we keep the previous set of bounds around so 294 // Whenever the bounds are set, we keep the previous set of bounds around so
290 // we can have a better chance of getting the real 295 // we can have a better chance of getting the real
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 base::CancelableCallback<void()> delayed_resize_task_; 414 base::CancelableCallback<void()> delayed_resize_task_;
410 415
411 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_; 416 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
412 417
413 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11); 418 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
414 }; 419 };
415 420
416 } // namespace views 421 } // namespace views
417 422
418 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 423 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698