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

Unified Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

Issue 1886983003: Add a crash for debugging when we get into a bad state. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: set flase Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h ('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 2b0f75652ed29a0efafe6783f47230401f2bbfc8..7889e4767e34e499cec8cd6f7261607df108e904 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
@@ -1653,6 +1653,7 @@ void DesktopWindowTreeHostX11::MapWindow(ui::WindowShowState show_state) {
1);
}
+ x_map_window_was_called_ = true;
XMapWindow(xdisplay_, xwindow_);
// We now block until our window is mapped. Some X11 APIs will crash and
@@ -1661,6 +1662,7 @@ void DesktopWindowTreeHostX11::MapWindow(ui::WindowShowState show_state) {
if (ui::X11EventSource::GetInstance())
ui::X11EventSource::GetInstance()->BlockUntilWindowMapped(xwindow_);
window_mapped_ = true;
+ x_map_window_was_called_ = false;
UpdateMinAndMaxSize();
@@ -1883,6 +1885,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
break;
}
case MapNotify: {
+ CHECK(x_map_window_was_called_)
+ << "Received MapNotify event despite never calling XMapWindow(). "
+ << "(This is debugging state for crbug.com/381732.)";
+
FOR_EACH_OBSERVER(DesktopWindowTreeHostObserverX11,
observer_list_,
OnWindowMapped(xwindow_));
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698