Makes display roots be destroyed by client

services/ui/ws/window_manager_state.h

 // Copyright 2016 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.
 
 #ifndef SERVICES_UI_WS_WINDOW_MANAGER_STATE_H_
 #define SERVICES_UI_WS_WINDOW_MANAGER_STATE_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <queue>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "services/ui/public/interfaces/display.mojom.h"
 #include "services/ui/ws/event_dispatcher.h"
 #include "services/ui/ws/event_dispatcher_delegate.h"
+#include "services/ui/ws/server_window_observer.h"
 #include "services/ui/ws/user_id.h"
 #include "services/ui/ws/window_server.h"
 
 namespace ui {
 namespace ws {
 
 class DisplayManager;
+class WindowManagerDisplayRoot;
 class WindowTree;
 
 namespace test {
 class WindowManagerStateTestApi;
 }
 
 // Manages state specific to a WindowManager that is shared across displays.
 // WindowManagerState is owned by the WindowTree the window manager is
 // associated with.
-class WindowManagerState : public EventDispatcherDelegate {
+class WindowManagerState : public EventDispatcherDelegate,
+                           public ServerWindowObserver {
  public:
   explicit WindowManagerState(WindowTree* window_tree);
   ~WindowManagerState() override;
 
   const UserId& user_id() const;
 
   WindowTree* window_tree() { return window_tree_; }
   const WindowTree* window_tree() const { return window_tree_; }
 
   void OnWillDestroyTree(WindowTree* tree);
@@ skipping 19 matching lines @@
       DragSource* drag_source,
       ServerWindow* window,
       DragTargetConnection* source_connection,
       int32_t drag_pointer,
       mojo::Map<mojo::String, mojo::Array<uint8_t>> drag_data,
       uint32_t drag_operation);
   void EndDragDrop();
 
   void AddSystemModalWindow(ServerWindow* window);
 
+  // Returns the ServerWindow corresponding to an orphaned root with the
+  // specified id. See |orphaned_window_manager_display_roots_| for details on
+  // what on orphaned root is.
+  ServerWindow* GetOrphanedRootWithId(const WindowId& id);
+
   // TODO(sky): EventDispatcher is really an implementation detail and should
   // not be exposed.
   EventDispatcher* event_dispatcher() { return &event_dispatcher_; }
 
   // Returns true if this is the WindowManager of the active user.
   bool IsActive() const;
 
   void Activate(const gfx::Point& mouse_location_on_screen);
   void Deactivate();
 
   // Processes an event from PlatformDisplay.
   void ProcessEvent(const ui::Event& event);
 
   // Called when the ack from an event dispatched to WindowTree |tree| is
   // received.
   // TODO(sky): make this private and use a callback.
   void OnEventAck(mojom::WindowTree* tree, mojom::EventResult result);
 
   // Called when the WindowManager acks an accelerator.
   void OnAcceleratorAck(mojom::EventResult result);
 
  private:
   class ProcessedEventTarget;
   friend class Display;
   friend class test::WindowManagerStateTestApi;
 
+  // Set of display roots. This is a vector rather than a set to support removal
+  // without deleting.
+  using WindowManagerDisplayRoots =
+      std::vector<std::unique_ptr<WindowManagerDisplayRoot>>;
+
   enum class DebugAcceleratorType {
     PRINT_WINDOWS,
   };
 
   struct DebugAccelerator {
     bool Matches(const ui::KeyEvent& event) const;
 
     DebugAcceleratorType type;
     ui::KeyboardCode key_code;
     int event_flags;
@@ skipping 25 matching lines @@
     std::unique_ptr<ui::Event> event;
     std::unique_ptr<ProcessedEventTarget> processed_target;
   };
 
   const WindowServer* window_server() const;
   WindowServer* window_server();
 
   DisplayManager* display_manager();
   const DisplayManager* display_manager() const;
 
+  // Adds |display_root| to the set of WindowManagerDisplayRoots owned by this
+  // WindowManagerState.
+  void AddWindowManagerDisplayRoot(
+      std::unique_ptr<WindowManagerDisplayRoot> display_root);
+
+  // Called when a Display is deleted.
+  void OnDisplayDestroying(Display* display);
+
   // Sets the visibility of all window manager roots windows to |value|.
   void SetAllRootWindowsVisible(bool value);
 
   // Returns the ServerWindow that is the root of the WindowManager for
   // |window|. |window| corresponds to the root of a Display.
   ServerWindow* GetWindowManagerRoot(ServerWindow* window);
 
   // Called if the client doesn't ack an event in the appropriate amount of
   // time.
   void OnEventAckTimeout(ClientSpecificId client_id);
@@ skipping 43 matching lines @@
   void OnMouseCursorLocationChanged(const gfx::Point& point) override;
   void DispatchInputEventToWindow(ServerWindow* target,
                                   ClientSpecificId client_id,
                                   const ui::Event& event,
                                   Accelerator* accelerator) override;
   ClientSpecificId GetEventTargetClientId(const ServerWindow* window,
                                           bool in_nonclient_area) override;
   ServerWindow* GetRootWindowContaining(gfx::Point* location) override;
   void OnEventTargetNotFound(const ui::Event& event) override;
 
+  // ServerWindowObserver:
+  void OnWindowEmbeddedAppDisconnected(ServerWindow* window) override;
+
   // The single WindowTree this WindowManagerState is associated with.
   // |window_tree_| owns this.
   WindowTree* window_tree_;
 
   // Set to true the first time SetFrameDecorationValues() is called.
   bool got_frame_decoration_values_ = false;
   mojom::FrameDecorationValuesPtr frame_decoration_values_;
 
   EventDispatchPhase event_dispatch_phase_ = EventDispatchPhase::NONE;
   // The tree we're waiting to process the current accelerator or event.
   mojom::WindowTree* tree_awaiting_input_ack_ = nullptr;
   // The event we're awaiting an accelerator or input ack from.
   std::unique_ptr<ui::Event> event_awaiting_input_ack_;
   base::WeakPtr<Accelerator> post_target_accelerator_;
   std::queue<std::unique_ptr<QueuedEvent>> event_queue_;
   base::OneShotTimer event_ack_timer_;
 
   std::vector<DebugAccelerator> debug_accelerators_;
 
   EventDispatcher event_dispatcher_;
 
   // PlatformDisplay that currently has capture.
   PlatformDisplay* platform_display_with_capture_ = nullptr;
 
+  // All the active WindowManagerDisplayRoots.
+  WindowManagerDisplayRoots window_manager_display_roots_;
+
+  // Set of WindowManagerDisplayRoots corresponding to Displays that have been
+  // destroyed. WindowManagerDisplayRoots are not destroyed immediately when
+  // the Display is destroyed to allow the client to destroy the window when it
+  // wants to. Once the client destroys the window WindowManagerDisplayRoots is
+  // destroyed.
+  WindowManagerDisplayRoots orphaned_window_manager_display_roots_;
+
   base::WeakPtrFactory<WindowManagerState> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerState);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_MANAGER_STATE_H_