| Index: media/remoting/remote_renderer_impl.cc
|
| diff --git a/media/remoting/remote_renderer_impl.cc b/media/remoting/remote_renderer_impl.cc
|
| index b814b00cbc0dcfb159f6d67e54529ae2e994f7e1..33ee43bea036b876b24c4b03137292ad59096d8e 100644
|
| --- a/media/remoting/remote_renderer_impl.cc
|
| +++ b/media/remoting/remote_renderer_impl.cc
|
| @@ -629,7 +629,7 @@ void RemoteRendererImpl::OnFatalError(PipelineStatus error) {
|
| void RemoteRendererImpl::RequestUpdateInterstitialOnMainThread(
|
| scoped_refptr<base::SingleThreadTaskRunner> media_task_runner,
|
| base::WeakPtr<RemoteRendererImpl> remote_renderer_impl,
|
| - const SkBitmap& background_image,
|
| + const base::Optional<SkBitmap>& background_image,
|
| const gfx::Size& canvas_size,
|
| RemotingInterstitialType interstitial_type) {
|
| media_task_runner->PostTask(
|
| @@ -639,12 +639,12 @@ void RemoteRendererImpl::RequestUpdateInterstitialOnMainThread(
|
| }
|
|
|
| void RemoteRendererImpl::UpdateInterstitial(
|
| - const SkBitmap& background_image,
|
| + const base::Optional<SkBitmap>& background_image,
|
| const gfx::Size& canvas_size,
|
| RemotingInterstitialType interstitial_type) {
|
| DCHECK(media_task_runner_->BelongsToCurrentThread());
|
| - if (!background_image.drawsNothing())
|
| - interstitial_background_ = background_image;
|
| + if (background_image.has_value())
|
| + interstitial_background_ = background_image.value();
|
| canvas_size_ = canvas_size;
|
| PaintRemotingInterstitial(interstitial_background_, canvas_size_,
|
| interstitial_type, video_renderer_sink_);
|
|
|