| Index: media/filters/video_frame_scheduler_proxy.h
|
| diff --git a/media/filters/video_frame_scheduler_proxy.h b/media/filters/video_frame_scheduler_proxy.h
|
| index d17fb5632bc3e9a3ce1dc32b4659e1f38b60b7f5..22170552378cbb3d26410c1e8219c9201285885b 100644
|
| --- a/media/filters/video_frame_scheduler_proxy.h
|
| +++ b/media/filters/video_frame_scheduler_proxy.h
|
| @@ -22,11 +22,10 @@ class MEDIA_EXPORT VideoFrameSchedulerProxy : public VideoFrameScheduler {
|
| public:
|
| // |task_runner| is the runner that this object will be called on.
|
| // |scheduler_runner| is the runner that |scheduler| will be called on.
|
| - // |scheduler| must out-live the lifetime of this object.
|
| VideoFrameSchedulerProxy(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& scheduler_runner,
|
| - VideoFrameScheduler* scheduler);
|
| + scoped_ptr<VideoFrameScheduler> scheduler);
|
| virtual ~VideoFrameSchedulerProxy();
|
|
|
| // VideoFrameScheduler implementation.
|
| @@ -38,7 +37,7 @@ class MEDIA_EXPORT VideoFrameSchedulerProxy : public VideoFrameScheduler {
|
| private:
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| scoped_refptr<base::SingleThreadTaskRunner> scheduler_runner_;
|
| - VideoFrameScheduler* scheduler_; // Not owned.
|
| + scoped_ptr<VideoFrameScheduler> scheduler_;
|
|
|
| // NOTE: Weak pointers must be invalidated before all other member variables.
|
| base::WeakPtrFactory<VideoFrameSchedulerProxy> weak_factory_;
|
|
|