Mus+Ash: Use standard cc mechanism for surface lifetime.

services/ui/ws/display.h

 // Copyright 2015 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_DISPLAY_H_
 #define SERVICES_UI_WS_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 37 matching lines @@
 // ways:
 // . with a DisplayBinding. In this mode there is only ever one WindowManager
 //   for the display, which comes from the client that created the
 //   Display.
 // . without a DisplayBinding. In this mode a WindowManager is automatically
 //   created per user.
 class Display : public PlatformDisplayDelegate,
                 public mojom::WindowTreeHost,
                 public FocusControllerObserver,
                 public FocusControllerDelegate,
-                public ServerWindowObserver,
                 public UserIdTrackerObserver,
                 public WindowManagerWindowTreeFactorySetObserver {
  public:
   Display(WindowServer* window_server,
           const PlatformDisplayInitParams& platform_display_init_params);
   ~Display() override;
 
   // Initializes state that depends on the existence of a Display.
   void Init(std::unique_ptr<DisplayBinding> binding);
 
   int64_t GetId() const;
 
   DisplayManager* display_manager();
   const DisplayManager* display_manager() const;
 
   PlatformDisplay* platform_display() { return platform_display_.get(); }
 
   // Returns a mojom::WsDisplay for the specified display. WindowManager
   // specific values are not set.
   mojom::WsDisplayPtr ToWsDisplay() const;
 
   // Returns a display::Display for the specficied display.
   display::Display ToDisplay() const;
 
   // Schedules a paint for the specified region in the coordinates of |window|.
   void SchedulePaint(const ServerWindow* window, const gfx::Rect& bounds);
 
-  // Schedules destruction of surfaces in |window|. If a frame has been
-  // scheduled but not drawn surface destruction is delayed until the frame is
-  // drawn, otherwise destruction is immediate.
-  void ScheduleSurfaceDestruction(ServerWindow* window);
-
   display::Display::Rotation GetRotation() const;
   gfx::Size GetSize() const;
 
   WindowServer* window_server() { return window_server_; }
 
   // Returns the root of the Display. The root's children are the roots
   // of the corresponding WindowManagers.
   ServerWindow* root_window() { return root_.get(); }
   const ServerWindow* root_window() const { return root_.get(); }
 
@@ skipping 67 matching lines @@
       WindowManagerWindowTreeFactory* factory);
 
   // PlatformDisplayDelegate:
   void CreateRootWindow(const gfx::Size& size) override;
   ServerWindow* GetRootWindow() override;
   bool IsInHighContrastMode() override;
   void OnEvent(const ui::Event& event) override;
   void OnNativeCaptureLost() override;
   void OnViewportMetricsChanged(const ViewportMetrics& old_metrics,
                                 const ViewportMetrics& new_metrics) override;
-  void OnCompositorFrameDrawn() override;
 
   // FocusControllerDelegate:
   bool CanHaveActiveChildren(ServerWindow* window) const override;
 
   // FocusControllerObserver:
   void OnActivationChanged(ServerWindow* old_active_window,
                            ServerWindow* new_active_window) override;
   void OnFocusChanged(FocusControllerChangeSource change_source,
                       ServerWindow* old_focused_window,
                       ServerWindow* new_focused_window) override;
 
-  // ServerWindowObserver:
-  void OnWindowDestroyed(ServerWindow* window) override;
-
   // UserIdTrackerObserver:
   void OnUserIdRemoved(const UserId& id) override;
 
   // WindowManagerWindowTreeFactorySetObserver:
   void OnWindowManagerWindowTreeFactoryReady(
       WindowManagerWindowTreeFactory* factory) override;
 
   std::unique_ptr<DisplayBinding> binding_;
   // Set once Init() has been called.
   bool init_called_ = false;
   WindowServer* const window_server_;
   std::unique_ptr<ServerWindow> root_;
   std::unique_ptr<PlatformDisplay> platform_display_;
   std::unique_ptr<FocusController> focus_controller_;
 
   // The last cursor set. Used to track whether we need to change the cursor.
   mojom::Cursor last_cursor_;
 
   ServerWindowTracker activation_parents_;
 
-  // Set of windows with surfaces that need to be destroyed once the frame
-  // draws.
-  std::set<ServerWindow*> windows_needing_frame_destruction_;
-
   WindowManagerDisplayRootMap window_manager_display_root_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DISPLAY_H_