diff options
| author | annacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 20:46:01 +0000 |
|---|---|---|
| committer | annacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 20:46:01 +0000 |
| commit | 7bdad1a4a53f98d31f00672cbfe2eaa81b95407d (patch) | |
| tree | 0fc22a5d2de07599f4e7a6c1577ffb703d66ad97 /webkit/media | |
| parent | 6a40ddad00cc5c1a329c39605633c818782b84ad (diff) | |
| download | chromium_src-7bdad1a4a53f98d31f00672cbfe2eaa81b95407d.zip chromium_src-7bdad1a4a53f98d31f00672cbfe2eaa81b95407d.tar.gz chromium_src-7bdad1a4a53f98d31f00672cbfe2eaa81b95407d.tar.bz2 | |
Re-add sourceSetTimestampOffset to webmediaplayer_impl
sourceSetTimestampOffset() was removed in r150129 because it looked like it wasn't being used. It just hadn't been hooked up to WebKit yet. This patch will add it back.
BUG=141659
Review URL: https://chromiumcodereview.appspot.com/10823260
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150894 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/webmediaplayer_impl.cc | 5 | ||||
| -rw-r--r-- | webkit/media/webmediaplayer_impl.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index 7fef4e0..a297325 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -682,6 +682,11 @@ void WebMediaPlayerImpl::sourceEndOfStream( GetClient()->durationChanged(); } +bool WebMediaPlayerImpl::sourceSetTimestampOffset(const WebKit::WebString& id, + double offset) { + return proxy_->DemuxerSetTimestampOffset(id.utf8().data(), offset); +} + WebKit::WebMediaPlayer::MediaKeyException WebMediaPlayerImpl::generateKeyRequest(const WebString& key_system, const unsigned char* init_data, diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h index 161b962..3ef3c27 100644 --- a/webkit/media/webmediaplayer_impl.h +++ b/webkit/media/webmediaplayer_impl.h @@ -199,6 +199,8 @@ class WebMediaPlayerImpl unsigned length); virtual bool sourceAbort(const WebKit::WebString& id); virtual void sourceEndOfStream(EndOfStreamStatus status); + virtual bool sourceSetTimestampOffset(const WebKit::WebString& id, + double offset); virtual MediaKeyException generateKeyRequest( const WebKit::WebString& key_system, |