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

Unified Diff: ui/app_list/views/apps_grid_view.cc

Issue 264413003: Fix crash on fast consecutive item moves in the Windows app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@land_cancel_reparent
Patch Set: Created 6 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/apps_grid_view.cc
diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc
index 25334137e67f26e44d3420c8ff82a26f42b60507..35eb6f40ed20eaeae9efa451866beac67c9c9979 100644
--- a/ui/app_list/views/apps_grid_view.cc
+++ b/ui/app_list/views/apps_grid_view.cc
@@ -557,6 +557,11 @@ void AppsGridView::UpdateDrag(Pointer pointer, const gfx::Point& point) {
// Move the view to the front so that it appears on top of other views.
ReorderChildView(drag_view_, -1);
bounds_animator_.StopAnimatingView(drag_view_);
+ // Stopping the animation may have invalidated our drag view due to the
+ // view hierarchy changing.
+ if (!drag_view_)
+ return;
+
StartSettingUpSynchronousDrag();
if (!dragging_for_reparent_item_)
StartDragAndDropHostDrag(point);
« 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