Fix resource leak on macOS

Bug: 1143042
Change-Id: I70e3c4757e7f1e48a0df30495bffc99b2a9336f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2505675
Commit-Queue: Peng Huang <penghuang@chromium.org>
Commit-Queue: Vasiliy Telezhnikov <vasilyt@chromium.org>
Auto-Submit: Peng Huang <penghuang@chromium.org>
Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821871}

components/viz/service/display/display_resource_provider.cc

@@ -966,16 +966,13 @@ DisplayResourceProvider::ScopedReadLockSharedImage::ScopedReadLockSharedImage(
 
 DisplayResourceProvider::ScopedReadLockSharedImage::
     ~ScopedReadLockSharedImage() {
-  if (!resource_provider_)
-    return;
-  DCHECK(resource_->lock_for_overlay_count);
-  resource_->lock_for_overlay_count--;
-  resource_provider_->TryReleaseResource(resource_id_, resource_);
+  Reset();
 }
 
 DisplayResourceProvider::ScopedReadLockSharedImage&
 DisplayResourceProvider::ScopedReadLockSharedImage::operator=(
     ScopedReadLockSharedImage&& other) {
+  Reset();
   resource_provider_ = other.resource_provider_;
   resource_id_ = other.resource_id_;
   resource_ = other.resource_;
@@ -985,6 +982,17 @@ DisplayResourceProvider::ScopedReadLockSharedImage::operator=(
   return *this;
 }
 
+void DisplayResourceProvider::ScopedReadLockSharedImage::Reset() {
+  if (!resource_provider_)
+    return;
+  DCHECK(resource_->lock_for_overlay_count);
+  resource_->lock_for_overlay_count--;
+  resource_provider_->TryReleaseResource(resource_id_, resource_);
+  resource_provider_ = nullptr;
+  resource_id_ = kInvalidResourceId;
+  resource_ = nullptr;
+}
+
 DisplayResourceProvider::LockSetForExternalUse::LockSetForExternalUse(
     DisplayResourceProvider* resource_provider,
     ExternalUseClient* client)

components/viz/service/display/display_resource_provider.h

@@ -237,9 +237,11 @@ class VIZ_SERVICE_EXPORT DisplayResourceProvider
     }
 
    private:
-    DisplayResourceProvider* resource_provider_;
-    ResourceId resource_id_;
-    ChildResource* resource_;
+    void Reset();
+
+    DisplayResourceProvider* resource_provider_ = nullptr;
+    ResourceId resource_id_ = kInvalidResourceId;
+    ChildResource* resource_ = nullptr;
   };
 
   // Maintains set of resources locked for external use by SkiaRenderer.

components/viz/service/display/skia_renderer.cc

@@ -756,7 +756,7 @@ void SkiaRenderer::SwapBuffersSkipped() {
 }
 
 void SkiaRenderer::SwapBuffersComplete() {
-  // Right now, only macOS needs to return maliboxes of released overlays, so
+  // Right now, only macOS needs to return mailboxes of released overlays, so
   // we should not release |committed_overlay_locks_| here. The resources in it
   // will be released by DidReceiveReleasedOverlays() later.
 #if defined(OS_APPLE)