cc: Get rid of SurfaceDestroyed and use SurfaceDiscarded instead

cc/surfaces/display.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 "cc/surfaces/display.h"
 
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 413 matching lines @@
     return false;
 
   return surface->HasUndrawnActiveFrame();
 }
 
 void Display::OnSurfaceCreated(const SurfaceInfo& surface_info) {
   if (scheduler_)
     scheduler_->SurfaceCreated(surface_info);
 }
 
-void Display::OnSurfaceDestroyed(const SurfaceId& surface_id) {
-  if (scheduler_)
-    scheduler_->SurfaceDestroyed(surface_id);
-}
-
 void Display::OnSurfaceDamageExpected(const SurfaceId& surface_id,
                                       const BeginFrameArgs& args) {
   if (scheduler_)
     scheduler_->SurfaceDamageExpected(surface_id, args);
 }
 
 void Display::OnSurfaceDiscarded(const SurfaceId& surface_id) {
+  if (scheduler_)
+    scheduler_->SurfaceDiscarded(surface_id);
+
   if (aggregator_)
     aggregator_->ReleaseResources(surface_id);
 }
 
 const SurfaceId& Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
 void Display::ForceImmediateDrawAndSwapIfPossible() {
   if (scheduler_)
     scheduler_->ForceImmediateSwapIfPossible();
 }
 
 }  // namespace cc