Commit 25b13199 authored by Becca Hughes's avatar Becca Hughes Committed by Commit Bot

[Media Session] Convert to weak ptr

Convert the GetMediaImageBitmap to use a weak ptr of
the ImageObserverHolder to fix a crash.

BUG=982073

Change-Id: I3f97e778d2c99e55bdc4287c8073a6f3639d069a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1692219Reviewed-by: default avatarKen Rockot <rockot@google.com>
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#675772}
parent f55ca439
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <set> #include <set>
#include "base/memory/weak_ptr.h"
#include "services/media_session/audio_focus_request.h" #include "services/media_session/audio_focus_request.h"
#include "services/media_session/public/cpp/media_image_manager.h" #include "services/media_session/public/cpp/media_image_manager.h"
...@@ -56,7 +57,7 @@ class MediaController::ImageObserverHolder { ...@@ -56,7 +57,7 @@ class MediaController::ImageObserverHolder {
owner_->session_->ipc()->GetMediaImageBitmap( owner_->session_->ipc()->GetMediaImageBitmap(
*image, minimum_size_px_, desired_size_px_, *image, minimum_size_px_, desired_size_px_,
base::BindOnce(&MediaController::ImageObserverHolder::OnImage, base::BindOnce(&MediaController::ImageObserverHolder::OnImage,
base::Unretained(this))); weak_ptr_factory_.GetWeakPtr()));
} }
void ClearImage() { void ClearImage() {
...@@ -80,6 +81,8 @@ class MediaController::ImageObserverHolder { ...@@ -80,6 +81,8 @@ class MediaController::ImageObserverHolder {
mojom::MediaControllerImageObserverPtr observer_; mojom::MediaControllerImageObserverPtr observer_;
base::WeakPtrFactory<ImageObserverHolder> weak_ptr_factory_{this};
DISALLOW_COPY_AND_ASSIGN(ImageObserverHolder); DISALLOW_COPY_AND_ASSIGN(ImageObserverHolder);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment