diff options
| author | Bartosz Fabianowski <bartfab@chromium.org> | 2015-04-16 12:27:51 +0200 |
|---|---|---|
| committer | Bartosz Fabianowski <bartfab@chromium.org> | 2015-04-16 10:28:32 +0000 |
| commit | 85a8238181175de195158bf1554f530cd0f6e3f1 (patch) | |
| tree | 72b0b33ece151dc9cdb2e7af36e8d554ec64350e /content/renderer/media/android/webmediaplayer_android.h | |
| parent | 919dce4400651813d5ff6e8a85b944a5987adcb7 (diff) | |
| download | chromium_src-85a8238181175de195158bf1554f530cd0f6e3f1.zip chromium_src-85a8238181175de195158bf1554f530cd0f6e3f1.tar.gz chromium_src-85a8238181175de195158bf1554f530cd0f6e3f1.tar.bz2 | |
Revert "Speculative revert by sheriff"
This reverts commit 919dce4400651813d5ff6e8a85b944a5987adcb7.
BUG=None
TBR=akuegel
Review URL: https://codereview.chromium.org/1094553002
Cr-Commit-Position: refs/heads/master@{#325412}
Diffstat (limited to 'content/renderer/media/android/webmediaplayer_android.h')
| -rw-r--r-- | content/renderer/media/android/webmediaplayer_android.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h index c1e30101..5d5f653 100644 --- a/content/renderer/media/android/webmediaplayer_android.h +++ b/content/renderer/media/android/webmediaplayer_android.h @@ -185,8 +185,10 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, // compositor thread. void SetVideoFrameProviderClient( cc::VideoFrameProvider::Client* client) override; + bool UpdateCurrentFrame(base::TimeTicks deadline_min, + base::TimeTicks deadline_max) override; scoped_refptr<media::VideoFrame> GetCurrentFrame() override; - void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame) override; + void PutCurrentFrame() override; // Media player callback handlers. void OnMediaMetadataChanged(const base::TimeDelta& duration, int width, |