| Index: content/renderer/media/android/media_source_delegate.h
|
| diff --git a/content/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h
|
| index 4c3564e2fc3bd9b0130c970b07bded236e4ca668..b9ae5be88cd2747b64f5741e114f8de3ae7334a8 100644
|
| --- a/content/renderer/media/android/media_source_delegate.h
|
| +++ b/content/renderer/media/android/media_source_delegate.h
|
| @@ -38,9 +38,9 @@ class RendererDemuxerAndroid;
|
|
|
| class MediaSourceDelegate : public media::DemuxerHost {
|
| public:
|
| - typedef base::Callback<void(WebKit::WebMediaSource*)>
|
| + typedef base::Callback<void(blink::WebMediaSource*)>
|
| MediaSourceOpenedCB;
|
| - typedef base::Callback<void(WebKit::WebMediaPlayer::NetworkState)>
|
| + typedef base::Callback<void(blink::WebMediaPlayer::NetworkState)>
|
| UpdateNetworkStateCB;
|
| typedef base::Callback<void(const base::TimeDelta&)> DurationChangeCB;
|
|
|
| @@ -73,7 +73,7 @@ class MediaSourceDelegate : public media::DemuxerHost {
|
| const UpdateNetworkStateCB& update_network_state_cb);
|
| #endif
|
|
|
| - const WebKit::WebTimeRanges& Buffered();
|
| + const blink::WebTimeRanges& Buffered();
|
| size_t DecodedFrameCount() const;
|
| size_t DroppedFrameCount() const;
|
| size_t AudioDecodedByteCount() const;
|
| @@ -218,14 +218,14 @@ class MediaSourceDelegate : public media::DemuxerHost {
|
| media::PipelineStatistics statistics_;
|
| media::Ranges<base::TimeDelta> buffered_time_ranges_;
|
| // Keep a list of buffered time ranges.
|
| - WebKit::WebTimeRanges buffered_web_time_ranges_;
|
| + blink::WebTimeRanges buffered_web_time_ranges_;
|
|
|
| MediaSourceOpenedCB media_source_opened_cb_;
|
| media::Demuxer::NeedKeyCB need_key_cb_;
|
|
|
| // The currently selected key system. Empty string means that no key system
|
| // has been selected.
|
| - WebKit::WebString current_key_system_;
|
| + blink::WebString current_key_system_;
|
|
|
| // Temporary for EME v0.1. In the future the init data type should be passed
|
| // through GenerateKeyRequest() directly from WebKit.
|
|
|