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

services/ui/ws/display.cc

 // 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.
 
 #include "services/ui/ws/display.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 36 matching lines @@
   window_server_->user_id_tracker()->RemoveObserver(this);
 
   window_server_->window_manager_window_tree_factory_set()->RemoveObserver(
       this);
 
   if (!focus_controller_) {
     focus_controller_->RemoveObserver(this);
     focus_controller_.reset();
   }
 
-  for (ServerWindow* window : windows_needing_frame_destruction_)
-    window->RemoveObserver(this);
-
   if (!binding_) {
     for (auto& pair : window_manager_display_root_map_)
       pair.second->window_manager_state()->OnDisplayDestroying(this);
   } else if (!window_manager_display_root_map_.empty()) {
     // If there is a |binding_| then the tree was created specifically for this
     // display (which corresponds to a WindowTreeHost).
     window_server_->DestroyTree(window_manager_display_root_map_.begin()
                                     ->second->window_manager_state()
                                     ->window_tree());
   }
@@ skipping 42 matching lines @@
 
   return display;
 }
 
 void Display::SchedulePaint(const ServerWindow* window,
                             const gfx::Rect& bounds) {
   DCHECK(root_->Contains(window));
   platform_display_->SchedulePaint(window, bounds);
 }
 
-void Display::ScheduleSurfaceDestruction(ServerWindow* window) {
-  if (!platform_display_->IsFramePending()) {
-    window->DestroySurfacesScheduledForDestruction();
-    return;
-  }
-  if (windows_needing_frame_destruction_.count(window))
-    return;
-  windows_needing_frame_destruction_.insert(window);
-  window->AddObserver(this);
-}
-
 display::Display::Rotation Display::GetRotation() const {
   return platform_display_->GetRotation();
 }
 
 gfx::Size Display::GetSize() const {
   return platform_display_->GetBounds().size();
 }
 
 ServerWindow* Display::GetRootWithId(const WindowId& id) {
   if (id == root_->id())
@@ skipping 186 matching lines @@
     return;
 
   gfx::Rect new_bounds(new_metrics.bounds.size());
   root_->SetBounds(new_bounds);
   for (auto& pair : window_manager_display_root_map_)
     pair.second->root()->SetBounds(new_bounds);
 
   display_manager()->OnDisplayUpdate(this);
 }
 
-void Display::OnCompositorFrameDrawn() {
-  std::set<ServerWindow*> windows;
-  windows.swap(windows_needing_frame_destruction_);
-  for (ServerWindow* window : windows) {
-    window->RemoveObserver(this);
-    window->DestroySurfacesScheduledForDestruction();
-  }
-}
-
 bool Display::CanHaveActiveChildren(ServerWindow* window) const {
   return window && activation_parents_.Contains(window);
 }
 
 void Display::OnActivationChanged(ServerWindow* old_active_window,
                                   ServerWindow* new_active_window) {
   // Don't do anything here. We assume the window manager handles restacking. If
   // we did attempt to restack than we would have to ensure clients see the
   // restack.
 }
@@ skipping 53 matching lines @@
     if (wm_tree != owning_tree_old && wm_tree != embedded_tree_old &&
         wm_tree != owning_tree_new && wm_tree != embedded_tree_new) {
       wm_tree->ProcessFocusChanged(old_focused_window, new_focused_window);
     }
   }
 
   UpdateTextInputState(new_focused_window,
                        new_focused_window->text_input_state());
 }
 
-void Display::OnWindowDestroyed(ServerWindow* window) {
-  windows_needing_frame_destruction_.erase(window);
-  window->RemoveObserver(this);
-}
-
 void Display::OnUserIdRemoved(const UserId& id) {
   window_manager_display_root_map_.erase(id);
 }
 
 void Display::OnWindowManagerWindowTreeFactoryReady(
     WindowManagerWindowTreeFactory* factory) {
   if (!binding_)
     CreateWindowManagerDisplayRootFromFactory(factory);
 }
 
 }  // namespace ws
 }  // namespace ui