Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10020)

Unified Diff: content/browser/media/session/media_session_impl.cc

Issue 2715723002: Fix a crash in MediaSessionServiceImpl due to life time issue (Closed)
Patch Set: addressed nits Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/media/session/media_session_impl.cc
diff --git a/content/browser/media/session/media_session_impl.cc b/content/browser/media/session/media_session_impl.cc
index 778ce3a09edcb4e5f1ad5da49a2b2049c5a5ff2f..dd2e1db067dc363fa7430afe2cb94ef57b74acdb 100644
--- a/content/browser/media/session/media_session_impl.cc
+++ b/content/browser/media/session/media_session_impl.cc
@@ -110,6 +110,11 @@ void MediaSessionImpl::WebContentsDestroyed() {
AbandonSystemAudioFocusIfNeeded();
}
+void MediaSessionImpl::RenderFrameDeleted(RenderFrameHost* rfh) {
+ if (services_.count(rfh))
+ OnServiceDestroyed(services_[rfh]);
+}
+
void MediaSessionImpl::AddObserver(MediaSessionObserver* observer) {
observers_.AddObserver(observer);
}
@@ -574,7 +579,11 @@ bool MediaSessionImpl::AddOneShotPlayer(MediaSessionPlayerObserver* observer,
// MediaSessionService-related methods
void MediaSessionImpl::OnServiceCreated(MediaSessionServiceImpl* service) {
- services_[service->GetRenderFrameHost()] = service;
+ RenderFrameHost* rfh = service->GetRenderFrameHost();
+ if (!rfh)
+ return;
+
+ services_[rfh] = service;
UpdateRoutedService();
}
« no previous file with comments | « content/browser/media/session/media_session_impl.h ('k') | content/browser/media/session/media_session_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698