Makes display roots be destroyed by client

services/ui/ws/window_tree.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/ws/window_tree.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 276 matching lines @@
   ServerWindow* window = GetWindowByClientId(window_id);
   ServerWindow* transient_window = GetWindowByClientId(transient_window_id);
   if (window && transient_window && !transient_window->Contains(window) &&
       access_policy_->CanAddTransientWindow(window, transient_window)) {
     Operation op(this, window_server_, OperationType::ADD_TRANSIENT_WINDOW);
     return window->AddTransientWindow(transient_window);
   }
   return false;
 }
 
+bool WindowTree::DeleteWindow(const ClientWindowId& window_id) {
+  ServerWindow* window = GetWindowByClientId(window_id);
+  if (!window)
+    return false;
+
+  if (roots_.count(window) > 0) {
+    // Deleting a root behaves as an unembed.
+    window_server_->OnTreeMessagedClient(id_);
+    RemoveRoot(window, RemoveRootReason::UNEMBED);
+    return true;
+  }
+
+  if (!access_policy_->CanDeleteWindow(window) &&
+      !ShouldRouteToWindowManager(window)) {
+    return false;
+  }
+
+  // Have the owner of the tree service the actual delete.
+  WindowTree* tree = window_server_->GetTreeWithId(window->id().client_id);
+  return tree && tree->DeleteWindowImpl(this, window);
+}
+
 bool WindowTree::SetModal(const ClientWindowId& window_id) {
   ServerWindow* window = GetWindowByClientId(window_id);
   if (window && access_policy_->CanSetModal(window)) {
     WindowManagerDisplayRoot* display_root =
         GetWindowManagerDisplayRoot(window);
     if (window->transient_parent()) {
       window->SetModal();
     } else if (user_id_ != InvalidUserId()) {
       if (display_root)
         display_root->window_manager_state()->AddSystemModalWindow(window);
@@ skipping 158 matching lines @@
   if (needs_ack)
     GenerateEventAckId();
   else
     DCHECK_EQ(0u, event_ack_id_);
   // TODO(moshayedi): crbug.com/617167. Don't clone even once we map
   // mojom::Event directly to ui::Event.
   window_manager_internal_->OnAccelerator(event_ack_id_, accelerator_id,
                                           ui::Event::Clone(event));
 }
 
+void WindowTree::OnDisplayDestroying(int64_t display_id) {
+  DCHECK(window_manager_internal_);
+  window_manager_internal_->WmDisplayRemoved(display_id);
+}
+
 void WindowTree::ClientJankinessChanged(WindowTree* tree) {
   tree->janky_ = !tree->janky_;
   // Don't inform the client if it is the source of jank (which generally only
   // happens while debugging).
   if (window_manager_internal_ && tree != this) {
     window_manager_internal_->WmClientJankinessChanged(
         tree->id(), tree->janky());
   }
 }
 
@@ skipping 419 matching lines @@
   }
 
   // This client no longer knows about the window. Unparent any windows that
   // were parented to windows in the root.
   std::vector<ServerWindow*> local_windows;
   RemoveFromKnown(window, &local_windows);
   for (size_t i = 0; i < local_windows.size(); ++i)
     local_windows[i]->parent()->Remove(local_windows[i]);
 
   if (reason == RemoveRootReason::UNEMBED) {
-    window->OnEmbeddedAppDisconnected();
-
     // Notify the owner of the window it no longer has a client embedded in it.
+    // Owner is null in the case of the windowmanager unembedding itself from
+    // a root.
     WindowTree* owning_tree =
         window_server_->GetTreeWithId(window->id().client_id);
-    DCHECK(owning_tree && owning_tree != this);
-    owning_tree->client()->OnEmbeddedAppDisconnected(
-        owning_tree->ClientWindowIdForWindow(window).id);
+    if (owning_tree) {
+      DCHECK(owning_tree && owning_tree != this);
+      owning_tree->client()->OnEmbeddedAppDisconnected(
+          owning_tree->ClientWindowIdForWindow(window).id);
+    }
+
+    window->OnEmbeddedAppDisconnected();
   }
 }
 
 Array<mojom::WindowDataPtr> WindowTree::WindowsToWindowDatas(
     const std::vector<const ServerWindow*>& windows) {
   Array<mojom::WindowDataPtr> array(windows.size());
   for (size_t i = 0; i < windows.size(); ++i)
     array[i] = WindowToWindowData(windows[i]);
   return array;
 }
@@ skipping 181 matching lines @@
   waiting_for_top_level_window_info_.reset(
       new WaitingForTopLevelWindowInfo(client_window_id, wm_change_id));
 
   display_root->window_manager_state()
       ->window_tree()
       ->window_manager_internal_->WmCreateTopLevelWindow(
           wm_change_id, id_, std::move(transport_properties));
 }
 
 void WindowTree::DeleteWindow(uint32_t change_id, Id transport_window_id) {
-  ServerWindow* window =
-      GetWindowByClientId(ClientWindowId(transport_window_id));
-  bool success = false;
-  if (window && roots_.count(window) > 0) {
-    success = true;
-    window_server_->OnTreeMessagedClient(id_);
-    RemoveRoot(window, RemoveRootReason::UNEMBED);
-  } else {
-    bool should_close = window && (access_policy_->CanDeleteWindow(window) ||
-                                   ShouldRouteToWindowManager(window));
-    if (should_close) {
-      WindowTree* tree = window_server_->GetTreeWithId(window->id().client_id);
-      success = tree && tree->DeleteWindowImpl(this, window);
-    }
-  }
-  client()->OnChangeCompleted(change_id, success);
+  client()->OnChangeCompleted(
+      change_id, DeleteWindow(ClientWindowId(transport_window_id)));
 }
 
 void WindowTree::AddWindow(uint32_t change_id, Id parent_id, Id child_id) {
   client()->OnChangeCompleted(change_id, AddWindow(ClientWindowId(parent_id),
                                                    ClientWindowId(child_id)));
 }
 
 void WindowTree::RemoveWindowFromParent(uint32_t change_id, Id window_id) {
   bool success = false;
   ServerWindow* window = GetWindowByClientId(ClientWindowId(window_id));
@@ skipping 699 matching lines @@
   client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
                            effect_bitmask, callback);
 }
 
 void WindowTree::PerformOnDragDropDone() {
   client()->OnDragDropDone();
 }
 
 }  // namespace ws
 }  // namespace ui