| Index: media/base/pipeline.cc
|
| diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
|
| index c39ddcdf85a3492d0b22e96b5d2d56adf41f44f7..aaa6cb6e8ed7546e5db552f0cb676287ffea734c 100644
|
| --- a/media/base/pipeline.cc
|
| +++ b/media/base/pipeline.cc
|
| @@ -68,6 +68,7 @@
|
| const PipelineStatusCB& seek_cb,
|
| const PipelineMetadataCB& metadata_cb,
|
| const BufferingStateCB& buffering_state_cb,
|
| + const PaintCB& paint_cb,
|
| const base::Closure& duration_change_cb,
|
| const AddTextTrackCB& add_text_track_cb,
|
| const base::Closure& waiting_for_decryption_key_cb) {
|
| @@ -76,6 +77,7 @@
|
| DCHECK(!seek_cb.is_null());
|
| DCHECK(!metadata_cb.is_null());
|
| DCHECK(!buffering_state_cb.is_null());
|
| + DCHECK(!paint_cb.is_null());
|
|
|
| base::AutoLock auto_lock(lock_);
|
| CHECK(!running_) << "Media pipeline is already running";
|
| @@ -88,6 +90,7 @@
|
| seek_cb_ = seek_cb;
|
| metadata_cb_ = metadata_cb;
|
| buffering_state_cb_ = buffering_state_cb;
|
| + paint_cb_ = paint_cb;
|
| duration_change_cb_ = duration_change_cb;
|
| add_text_track_cb_ = add_text_track_cb;
|
| waiting_for_decryption_key_cb_ = waiting_for_decryption_key_cb;
|
| @@ -711,6 +714,7 @@
|
| done_cb,
|
| base::Bind(&Pipeline::OnUpdateStatistics, weak_this),
|
| base::Bind(&Pipeline::BufferingStateChanged, weak_this),
|
| + base::ResetAndReturn(&paint_cb_),
|
| base::Bind(&Pipeline::OnRendererEnded, weak_this),
|
| base::Bind(&Pipeline::OnError, weak_this),
|
| waiting_for_decryption_key_cb_);
|
|
|