Add multiple destruction callbacks to AndroidOverlay.

media/gpu/android_video_decode_accelerator.cc

 // Copyright (c) 2013 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 "media/gpu/android_video_decode_accelerator.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 409 matching lines @@
   // Notify |surface_chooser_| that we've started.  This guarantees that we'll
   // get a callback.  It might not be a synchronous callback, but we're not in
   // the synchronous case.  It will be soon, though.  For pre-M, we rely on the
   // fact that |surface_chooser_| won't tell us to use a SurfaceTexture while
   // waiting for an overlay to become ready, for example.
   surface_chooser_->Initialize(
       base::Bind(&AndroidVideoDecodeAccelerator::OnSurfaceTransition,
                  weak_this_factory_.GetWeakPtr()),
       base::Bind(&AndroidVideoDecodeAccelerator::OnSurfaceTransition,
                  weak_this_factory_.GetWeakPtr(), nullptr),
-      base::Bind(&AndroidVideoDecodeAccelerator::OnStopUsingOverlayImmediately,
-                 weak_this_factory_.GetWeakPtr()),
       std::move(factory));
 }
 
 void AndroidVideoDecodeAccelerator::OnSurfaceTransition(
     std::unique_ptr<AndroidOverlay> overlay) {
+  if (overlay) {
+    overlay->AddDestructionCallback(base::Bind(
+        &AndroidVideoDecodeAccelerator::OnStopUsingOverlayImmediately,
+        weak_this_factory_.GetWeakPtr()));
+  }
+
   // If we're waiting for a surface (e.g., during startup), then proceed
   // immediately.  Otherwise, wait for Dequeue to handle it.  This can probably
   // be merged with UpdateSurface.
   if (state_ == BEFORE_OVERLAY_INIT) {
     DCHECK(!incoming_overlay_);
     incoming_bundle_ = new AVDASurfaceBundle(std::move(overlay));
     InitializePictureBufferManager();
     return;
   }
 
@@ skipping 1233 matching lines @@
   codec_allocator_->ReleaseMediaCodec(std::move(media_codec_),
                                       codec_config_->surface_bundle);
 }
 
 void AndroidVideoDecodeAccelerator::ReleaseCodecAndBundle() {
   ReleaseCodec();
   codec_config_->surface_bundle = nullptr;
 }
 
 }  // namespace media