Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 6c4573fb75aecf16a14461ae0f5f84b162823718..c29aa62bfe15498b0d4324dc12a85b27e44f4210 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -5680,8 +5680,14 @@ void RenderViewImpl::OnWasHidden() { |
RenderWidget::OnWasHidden(); |
#if defined(OS_ANDROID) |
+ DCHECK(media_player_manager_); |
qinmin
2012/11/14 18:14:29
this DCHECK is useless, if media_player_manager_ i
Miguel Garcia
2012/11/14 18:50:32
Done.
|
+ |
// Inform WebMediaPlayerManagerAndroid to release all media player resources. |
- media_player_manager_->ReleaseMediaResources(); |
+ // unless some audio is playing. |
qinmin
2012/11/14 18:14:29
some media is playing
Miguel Garcia
2012/11/14 18:50:32
Done.
|
+ // If something is in progress the resource will not be freed, it will |
+ // only be freed once the tab is destroyed or if the user navigates away |
+ // via WebMediaPlayerAndroid::Destroy |
+ media_player_manager_->ReleaseMediaResourcesIfNotPlaying(); |
#endif |
if (webview()) { |