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

Unified Diff: ash/wm/toplevel_window_event_handler.cc

Issue 61443002: Prevents reentrant CompleteDrag when changing display configuration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@flag
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/toplevel_window_event_handler.cc
diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc
index ef8051d1eb1c83c1d0170eda29f744d5a5ba0dfe..10b2a886edb2212b6f8b837baf128f483dab7e9f 100644
--- a/ash/wm/toplevel_window_event_handler.cc
+++ b/ash/wm/toplevel_window_event_handler.cc
@@ -376,10 +376,7 @@ void ToplevelWindowEventHandler::EndMoveLoop() {
return;
in_move_loop_ = false;
- if (window_resizer_) {
- window_resizer_->resizer()->RevertDrag();
- window_resizer_.reset();
- }
+ CompleteDrag(DRAG_REVERT, 0);
quit_closure_.Run();
}
@@ -387,9 +384,8 @@ void ToplevelWindowEventHandler::OnDisplayConfigurationChanging() {
if (in_move_loop_) {
move_cancelled_ = true;
EndMoveLoop();
- } else if (window_resizer_) {
- window_resizer_->resizer()->RevertDrag();
- window_resizer_.reset();
+ } else {
+ CompleteDrag(DRAG_REVERT, 0);
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698