| Index: content/renderer/media/webmediaplayer_ms_compositor.h
|
| diff --git a/content/renderer/media/webmediaplayer_ms_compositor.h b/content/renderer/media/webmediaplayer_ms_compositor.h
|
| index 9cdf20d7713be5f8ebcde62796ae05b87de9506b..ba4bfe318d2cb2caa210a31df3a85601a3f9c37b 100644
|
| --- a/content/renderer/media/webmediaplayer_ms_compositor.h
|
| +++ b/content/renderer/media/webmediaplayer_ms_compositor.h
|
| @@ -60,7 +60,7 @@ class CONTENT_EXPORT WebMediaPlayerMSCompositor
|
|
|
| ~WebMediaPlayerMSCompositor() override;
|
|
|
| - void EnqueueFrame(const scoped_refptr<media::VideoFrame>& frame);
|
| + void EnqueueFrame(scoped_refptr<media::VideoFrame> frame);
|
|
|
| // Statistical data
|
| gfx::Size GetCurrentSize();
|
| @@ -88,6 +88,8 @@ class CONTENT_EXPORT WebMediaPlayerMSCompositor
|
| void StopRendering();
|
| void ReplaceCurrentFrameWithACopy();
|
|
|
| + base::WeakPtr<WebMediaPlayerMSCompositor> GetWeakPtr();
|
| +
|
| private:
|
| friend class WebMediaPlayerMSTest;
|
|
|
| @@ -156,7 +158,7 @@ class CONTENT_EXPORT WebMediaPlayerMSCompositor
|
| base::Lock current_frame_lock_;
|
|
|
| // Make sure the weak pointer factory member is the last member of the class.
|
| - base::WeakPtrFactory<WebMediaPlayerMSCompositor> weak_ptr_factory_;
|
| + base::WeakPtrFactory<WebMediaPlayerMSCompositor> weak_factory_for_compositor_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMSCompositor);
|
| };
|
|
|