Commit 784dfd84 authored by Ahmed Fakhry's avatar Ahmed Fakhry Committed by Commit Bot

Virtual Desks: Destroy any pending animations on shutdown

BUG=987868
TEST=Run ClusterFuzz Reproduce locally

Change-Id: I617ff4b44943aa10e957780bfcba6f69a6d485aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1725510
Commit-Queue: Ahmed Fakhry <afakhry@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682365}
parent 0656f2cb
...@@ -595,6 +595,9 @@ Shell::~Shell() { ...@@ -595,6 +595,9 @@ Shell::~Shell() {
for (auto& observer : shell_observers_) for (auto& observer : shell_observers_)
observer.OnShellDestroying(); observer.OnShellDestroying();
if (features::IsVirtualDesksEnabled())
desks_controller_->Shutdown();
// Wayland depends upon some ash specific objects. Destroy it early on. // Wayland depends upon some ash specific objects. Destroy it early on.
wayland_server_controller_.reset(); wayland_server_controller_.reset();
......
...@@ -105,6 +105,10 @@ DesksController* DesksController::Get() { ...@@ -105,6 +105,10 @@ DesksController* DesksController::Get() {
return Shell::Get()->desks_controller(); return Shell::Get()->desks_controller();
} }
void DesksController::Shutdown() {
desk_switch_animators_.clear();
}
void DesksController::AddObserver(Observer* observer) { void DesksController::AddObserver(Observer* observer) {
observers_.AddObserver(observer); observers_.AddObserver(observer);
} }
......
...@@ -64,6 +64,9 @@ class ASH_EXPORT DesksController ...@@ -64,6 +64,9 @@ class ASH_EXPORT DesksController
const Desk* active_desk() const { return active_desk_; } const Desk* active_desk() const { return active_desk_; }
// Destroys any pending animations in preparation for shutdown.
void Shutdown();
void AddObserver(Observer* observer); void AddObserver(Observer* observer);
void RemoveObserver(Observer* observer); void RemoveObserver(Observer* observer);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment