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

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

Issue 2630773002: Avoid blocking while mapping an X11 window (Closed)
Patch Set: fix flaky tests Created 3 years, 10 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 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 ::Window xwindow_; 287 ::Window xwindow_;
288 288
289 // Events selected on |xwindow_|. 289 // Events selected on |xwindow_|.
290 std::unique_ptr<ui::XScopedEventSelector> xwindow_events_; 290 std::unique_ptr<ui::XScopedEventSelector> xwindow_events_;
291 291
292 // The native root window. 292 // The native root window.
293 ::Window x_root_window_; 293 ::Window x_root_window_;
294 294
295 ui::X11AtomCache atom_cache_; 295 ui::X11AtomCache atom_cache_;
296 296
297 // Is the window mapped to the screen? 297 // Whether the window is mapped with respect to the X server.
298 bool window_mapped_; 298 bool window_mapped_;
299 299
300 // Should we wait for an UnmapNotify before trying to remap the window? 300 // Whether the window is visible with respect to Aura.
301 // If |wait_for_unmap_| is true, we have sent an XUnmapWindow request to the 301 bool is_visible_;
danakj 2017/03/09 20:45:34 I would name these more literally as the state the
Tom (Use chromium acct) 2017/03/10 01:29:57 Done.
302 // server and have yet to receive an UnmapNotify.
303 bool wait_for_unmap_;
304 302
305 // The bounds of |xwindow_|. 303 // The bounds of |xwindow_|.
306 gfx::Rect bounds_in_pixels_; 304 gfx::Rect bounds_in_pixels_;
307 305
308 // Whenever the bounds are set, we keep the previous set of bounds around so 306 // Whenever the bounds are set, we keep the previous set of bounds around so
309 // we can have a better chance of getting the real 307 // we can have a better chance of getting the real
310 // |restored_bounds_in_pixels_|. Window managers tend to send a Configure 308 // |restored_bounds_in_pixels_|. Window managers tend to send a Configure
311 // message with the maximized bounds, and then set the window maximized 309 // message with the maximized bounds, and then set the window maximized
312 // property. (We don't rely on this for when we request that the window be 310 // property. (We don't rely on this for when we request that the window be
313 // maximized, only when we detect that some other process has requested that 311 // maximized, only when we detect that some other process has requested that
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 431
434 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_; 432 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
435 base::WeakPtrFactory<DesktopWindowTreeHostX11> weak_factory_; 433 base::WeakPtrFactory<DesktopWindowTreeHostX11> weak_factory_;
436 434
437 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11); 435 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
438 }; 436 };
439 437
440 } // namespace views 438 } // namespace views
441 439
442 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 440 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698