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

services/ui/ws/server_window.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/server_window.h"
 
 #include <inttypes.h>
 #include <stddef.h>
 
 #include "base/strings/stringprintf.h"
@@ skipping 59 matching lines @@
 
 void ServerWindow::AddObserver(ServerWindowObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void ServerWindow::RemoveObserver(ServerWindowObserver* observer) {
   DCHECK(observers_.HasObserver(observer));
   observers_.RemoveObserver(observer);
 }
 
+bool ServerWindow::HasObserver(ServerWindowObserver* observer) {
+  return observers_.HasObserver(observer);
+}
+
 void ServerWindow::CreateSurface(mojom::SurfaceType surface_type,
                                  mojo::InterfaceRequest<mojom::Surface> request,
                                  mojom::SurfaceClientPtr client) {
   GetOrCreateSurfaceManager()->CreateSurface(surface_type, std::move(request),
                                              std::move(client));
 }
 
 void ServerWindow::Add(ServerWindow* child) {
   // We assume validation checks happened already.
   DCHECK(child);
@@ skipping 263 matching lines @@
 bool ServerWindow::IsDrawn() const {
   const ServerWindow* root = delegate_->GetRootWindow(this);
   if (!root || !root->visible())
     return false;
   const ServerWindow* window = this;
   while (window && window != root && window->visible())
     window = window->parent();
   return root == window;
 }
 
-void ServerWindow::DestroySurfacesScheduledForDestruction() {
-  if (!surface_manager_)
-    return;
-  ServerWindowSurface* surface = surface_manager_->GetDefaultSurface();
-  if (surface)
-    surface->DestroySurfacesScheduledForDestruction();
-
-  surface = surface_manager_->GetUnderlaySurface();
-  if (surface)
-    surface->DestroySurfacesScheduledForDestruction();
-}
-
 ServerWindowSurfaceManager* ServerWindow::GetOrCreateSurfaceManager() {
   if (!surface_manager_.get())
     surface_manager_ = base::MakeUnique<ServerWindowSurfaceManager>(this);
   return surface_manager_.get();
 }
 
 void ServerWindow::SetUnderlayOffset(const gfx::Vector2d& offset) {
   if (offset == underlay_offset_)
     return;
 
@@ skipping 78 matching lines @@
 }
 
 // static
 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) {
   return &window->stacking_target_;
 }
 
 }  // namespace ws
 
 }  // namespace ui