Commit 00bb6c1a authored by Mike Wasserman's avatar Mike Wasserman Committed by Commit Bot

mus: Fix shutdown crash in unified desktop mode

Remove and destroy reflectors before closing and deleting hosts.
(roughly: hosts own the surface that reflectors use for painting)

Bug: 806353
Change-Id: Idcbfad0da19f1ccdeabb5d6851e6d55602fdaed1
Reviewed-on: https://chromium-review.googlesource.com/892054Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533047}
parent b908ae21
...@@ -305,15 +305,15 @@ void MirrorWindowController::CloseIfNotNecessary() { ...@@ -305,15 +305,15 @@ void MirrorWindowController::CloseIfNotNecessary() {
} }
void MirrorWindowController::Close(bool delay_host_deletion) { void MirrorWindowController::Close(bool delay_host_deletion) {
for (auto& info : mirroring_host_info_map_)
CloseAndDeleteHost(info.second, delay_host_deletion);
mirroring_host_info_map_.clear();
if (reflector_) { if (reflector_) {
aura::Env::GetInstance()->context_factory_private()->RemoveReflector( aura::Env::GetInstance()->context_factory_private()->RemoveReflector(
reflector_.get()); reflector_.get());
reflector_.reset(); reflector_.reset();
} }
for (auto& info : mirroring_host_info_map_)
CloseAndDeleteHost(info.second, delay_host_deletion);
mirroring_host_info_map_.clear();
} }
void MirrorWindowController::OnHostResized(aura::WindowTreeHost* host) { void MirrorWindowController::OnHostResized(aura::WindowTreeHost* host) {
......
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