[m111] media: Destroy D3D11 resources before stub destruction

If the CommandBufferStub gets destroyed before the D3D11VideoDecoder,
DefaultTexture2DWrapper::GpuResources destructor will fail to make the
context current and set the context lost flag on its shared images which
prevents the destruction of the associated GL textures.

This CL fixes that by hooking up the WillDestroyStub callback so that
GpuResources can destroy its shared images before the stub is destroyed.
This is intended as a speculative fix for crbug.com/1410436.

(cherry picked from commit f80d846)

Bug: 1410436
Change-Id: Ic369f67fb87d466ec634cf9c92d31fef6d508bca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4201186
Auto-Submit: Sunny Sachanandani <sunnyps@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Sunny Sachanandani <sunnyps@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1099034}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4217996
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/branch-heads/5563@{#119}
Cr-Branched-From: 3ac59a6-refs/heads/main@{#1097615}

media/gpu/command_buffer_helper.cc

@@ -218,9 +218,9 @@ class CommandBufferHelperImpl
   }
 
  public:
-  void SetWillDestroyStubCB(WillDestroyStubCB will_destroy_stub_cb) override {
-    DCHECK(!will_destroy_stub_cb_);
-    will_destroy_stub_cb_ = std::move(will_destroy_stub_cb);
+  void AddWillDestroyStubCB(WillDestroyStubCB callback) override {
+    DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+    will_destroy_stub_callbacks_.push_back(std::move(callback));
   }
 
   bool IsPassthrough() const override {
@@ -303,8 +303,9 @@ class CommandBufferHelperImpl
     // sure that we're around a bit longer.
     scoped_refptr<CommandBufferHelper> thiz(this);
 
-    if (will_destroy_stub_cb_)
-      std::move(will_destroy_stub_cb_).Run(have_context);
+    for (auto& callback : will_destroy_stub_callbacks_) {
+      std::move(callback).Run(have_context);
+    }
 
     DestroyStub();
   }
@@ -337,7 +338,7 @@ class CommandBufferHelperImpl
 #endif
   std::map<GLuint, std::unique_ptr<gpu::gles2::AbstractTexture>> textures_;
 
-  WillDestroyStubCB will_destroy_stub_cb_;
+  std::vector<WillDestroyStubCB> will_destroy_stub_callbacks_;
 
   MemoryTrackerImpl memory_tracker_;
   gpu::MemoryTypeTracker memory_type_tracker_;

media/gpu/command_buffer_helper.h

@@ -137,9 +137,9 @@ class MEDIA_GPU_EXPORT CommandBufferHelper
                                       gl::GLImage* image) = 0;
 #endif
 
-  // Set the callback to be called when our stub is destroyed. This callback
+  // Add a callback to be called when our stub is destroyed. This callback
   // may not change the current context.
-  virtual void SetWillDestroyStubCB(WillDestroyStubCB will_destroy_stub_cb) = 0;
+  virtual void AddWillDestroyStubCB(WillDestroyStubCB callback) = 0;
 
   // Is the backing command buffer passthrough (versus validating).
   virtual bool IsPassthrough() const = 0;

media/gpu/test/fake_command_buffer_helper.cc

@@ -27,8 +27,9 @@ void FakeCommandBufferHelper::StubLost() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   // Keep a reference to |this| in case the destruction cb drops the last one.
   scoped_refptr<CommandBufferHelper> thiz(this);
-  if (will_destroy_stub_cb_)
-    std::move(will_destroy_stub_cb_).Run(!is_context_lost_);
+  for (auto& callback : will_destroy_stub_callbacks_) {
+    std::move(callback).Run(!is_context_lost_);
+  }
   has_stub_ = false;
   is_context_lost_ = true;
   is_context_current_ = false;
@@ -173,10 +174,8 @@ gpu::Mailbox FakeCommandBufferHelper::CreateLegacyMailbox(GLuint service_id) {
   return gpu::Mailbox::GenerateLegacyMailboxForTesting();
 }
 
-void FakeCommandBufferHelper::SetWillDestroyStubCB(
-    WillDestroyStubCB will_destroy_stub_cb) {
-  DCHECK(!will_destroy_stub_cb_);
-  will_destroy_stub_cb_ = std::move(will_destroy_stub_cb);
+void FakeCommandBufferHelper::AddWillDestroyStubCB(WillDestroyStubCB callback) {
+  will_destroy_stub_callbacks_.push_back(std::move(callback));
 }
 
 bool FakeCommandBufferHelper::IsPassthrough() const {

media/gpu/test/fake_command_buffer_helper.h

@@ -68,7 +68,7 @@ class FakeCommandBufferHelper : public CommandBufferHelper {
   bool BindClientManagedImage(GLuint service_id, gl::GLImage* image) override;
 #endif
   gpu::Mailbox CreateLegacyMailbox(GLuint service_id) override;
-  void SetWillDestroyStubCB(WillDestroyStubCB will_destroy_stub_cb) override;
+  void AddWillDestroyStubCB(WillDestroyStubCB callback) override;
   bool IsPassthrough() const override;
   bool SupportsTextureRectangle() const override;
 #endif
@@ -88,7 +88,7 @@ class FakeCommandBufferHelper : public CommandBufferHelper {
   std::set<GLuint> service_ids_;
   std::map<gpu::SyncToken, base::OnceClosure> waits_;
 
-  WillDestroyStubCB will_destroy_stub_cb_;
+  std::vector<WillDestroyStubCB> will_destroy_stub_callbacks_;
 };
 
 }  // namespace media

media/gpu/windows/d3d11_texture_wrapper.cc

@@ -212,6 +212,9 @@ DefaultTexture2DWrapper::GpuResources::GpuResources(
     return;
   }
 
+  helper_->AddWillDestroyStubCB(
+      base::BindOnce(&GpuResources::Destroy, weak_factory_.GetWeakPtr()));
+
   // Usage flags to allow the display compositor to draw from it, video to
   // decode, and allow webgl/canvas access.
   constexpr uint32_t usage =
@@ -270,7 +273,12 @@ DefaultTexture2DWrapper::GpuResources::GpuResources(
 
 DefaultTexture2DWrapper::GpuResources::~GpuResources() {
   // Destroy shared images with a current context, otherwise mark context lost.
-  if (!helper_ || !helper_->MakeContextCurrent()) {
+  const bool have_context = helper_ && helper_->MakeContextCurrent();
+  Destroy(have_context);
+}
+
+void DefaultTexture2DWrapper::GpuResources::Destroy(bool have_context) {
+  if (!have_context) {
     for (auto& shared_image_rep : shared_images_) {
       shared_image_rep->OnContextLost();
     }

media/gpu/windows/d3d11_texture_wrapper.h

@@ -121,10 +121,14 @@ class MEDIA_GPU_EXPORT DefaultTexture2DWrapper : public Texture2DWrapper {
     ~GpuResources();
 
    private:
+    void Destroy(bool have_context);
+
     scoped_refptr<CommandBufferHelper> helper_;
 
     std::vector<std::unique_ptr<gpu::SharedImageRepresentationFactoryRef>>
         shared_images_;
+
+    base::WeakPtrFactory<GpuResources> weak_factory_{this};
   };
 
   // Receive an error from |gpu_resources_| and store it in |received_error_|.