| Index: media/blink/webmediaplayer_impl.cc
|
| diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
|
| index 8d58384a7b40532f3a82898b511ebc3fba5f9e4e..64a44f770d4990fecbb35f8ce4b99328774cdd9f 100644
|
| --- a/media/blink/webmediaplayer_impl.cc
|
| +++ b/media/blink/webmediaplayer_impl.cc
|
| @@ -1105,6 +1105,12 @@ void WebMediaPlayerImpl::OnSuspendRequested(bool must_suspend) {
|
| return;
|
| #endif
|
|
|
| +#if defined(OS_MACOSX)
|
| + // TODO(sandersd): Idle suspend is disabled on OSX since hardware decoded
|
| + // frames are owned by the video decoder in the GPU process. A mechanism for
|
| + // detaching ownership from the decoder is needed. http://crbug.com/595716.
|
| + return;
|
| +#else
|
| // Suspend should never be requested unless required or we're already in an
|
| // idle state (paused or ended).
|
| DCHECK(must_suspend || paused_ || ended_);
|
| @@ -1115,6 +1121,7 @@ void WebMediaPlayerImpl::OnSuspendRequested(bool must_suspend) {
|
| pipeline_controller_.Suspend();
|
| if (must_suspend && delegate_)
|
| delegate_->PlayerGone(delegate_id_);
|
| +#endif
|
| }
|
|
|
| void WebMediaPlayerImpl::OnPlay() {
|
|
|