| Index: content/renderer/media/android/webmediaplayer_android.h
|
| diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h
|
| index 3ff74e056ea03c4651decf78b39656eca813ba5e..314d7ee56bee498e3910f9629aae4b57542d205d 100644
|
| --- a/content/renderer/media/android/webmediaplayer_android.h
|
| +++ b/content/renderer/media/android/webmediaplayer_android.h
|
| @@ -174,11 +174,10 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
|
|
|
| // cc::VideoFrameProvider implementation. These methods are running on the
|
| // compositor thread.
|
| - virtual void SetVideoFrameProviderClient(
|
| + void SetVideoFrameProviderClient(
|
| cc::VideoFrameProvider::Client* client) override;
|
| - virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() override;
|
| - virtual void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame)
|
| - override;
|
| + scoped_refptr<media::VideoFrame> GetCurrentFrame() override;
|
| + void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame) override;
|
|
|
| // Media player callback handlers.
|
| void OnMediaMetadataChanged(const base::TimeDelta& duration, int width,
|
| @@ -205,7 +204,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
|
| void OnRemoteRouteAvailabilityChanged(bool routes_available);
|
|
|
| // StreamTextureFactoryContextObserver implementation.
|
| - virtual void ResetStreamTextureProxy() override;
|
| + void ResetStreamTextureProxy() override;
|
|
|
| // Called when the player is released.
|
| virtual void OnPlayerReleased();
|
| @@ -216,7 +215,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
|
| virtual void ReleaseMediaResources();
|
|
|
| // RenderFrameObserver implementation.
|
| - virtual void OnDestruct() override;
|
| + void OnDestruct() override;
|
|
|
| #if defined(VIDEO_HOLE)
|
| // Calculate the boundary rectangle of the media player (i.e. location and
|
|
|