| Index: media/blink/webmediaplayer_cast_android.cc
|
| diff --git a/media/blink/webmediaplayer_cast_android.cc b/media/blink/webmediaplayer_cast_android.cc
|
| index fc3de1cf4a06cdf704c9f428d6b36a2ef4cffd78..cefd208bc0063517f3fc8555611941058ef33f89 100644
|
| --- a/media/blink/webmediaplayer_cast_android.cc
|
| +++ b/media/blink/webmediaplayer_cast_android.cc
|
| @@ -157,12 +157,8 @@ scoped_refptr<VideoFrame> MakeTextFrameForCast(
|
| WebMediaPlayerCast::WebMediaPlayerCast(
|
| WebMediaPlayerImpl* impl,
|
| blink::WebMediaPlayerClient* client,
|
| - const WebMediaPlayerParams::Context3DCB& context_3d_cb,
|
| - base::WeakPtr<WebMediaPlayerDelegate> delegate)
|
| - : webmediaplayer_(impl),
|
| - client_(client),
|
| - context_3d_cb_(context_3d_cb),
|
| - delegate_(delegate) {}
|
| + const WebMediaPlayerParams::Context3DCB& context_3d_cb)
|
| + : webmediaplayer_(impl), client_(client), context_3d_cb_(context_3d_cb) {}
|
|
|
| WebMediaPlayerCast::~WebMediaPlayerCast() {
|
| if (player_manager_) {
|
| @@ -174,10 +170,11 @@ WebMediaPlayerCast::~WebMediaPlayerCast() {
|
| }
|
|
|
| void WebMediaPlayerCast::Initialize(const GURL& url,
|
| - blink::WebLocalFrame* frame) {
|
| + blink::WebLocalFrame* frame,
|
| + int delegate_id) {
|
| player_manager_->Initialize(MEDIA_PLAYER_TYPE_REMOTE_ONLY, player_id_, url,
|
| frame->document().firstPartyForCookies(), 0,
|
| - frame->document().url(), true);
|
| + frame->document().url(), true, delegate_id);
|
| is_player_initialized_ = true;
|
| }
|
|
|
| @@ -200,7 +197,9 @@ void WebMediaPlayerCast::requestRemotePlaybackControl() {
|
| void WebMediaPlayerCast::OnMediaMetadataChanged(base::TimeDelta duration,
|
| int width,
|
| int height,
|
| - bool success) {}
|
| + bool success) {
|
| + duration_ = duration;
|
| +}
|
|
|
| void WebMediaPlayerCast::OnPlaybackComplete() {
|
| DVLOG(1) << __FUNCTION__;
|
| @@ -249,8 +248,6 @@ void WebMediaPlayerCast::OnConnectedToRemoteDevice(
|
| is_remote_ = true;
|
| initializing_ = true;
|
| paused_ = false;
|
| - if (delegate_)
|
| - delegate_->DidPlay(webmediaplayer_);
|
| client_->playbackStateChanged();
|
|
|
| remote_playback_message_ = remote_playback_message;
|
| @@ -273,8 +270,6 @@ void WebMediaPlayerCast::play() {
|
| player_manager_->Start(player_id_);
|
| remote_time_at_ = base::TimeTicks::Now();
|
| paused_ = false;
|
| - if (delegate_)
|
| - delegate_->DidPlay(webmediaplayer_);
|
| }
|
|
|
| void WebMediaPlayerCast::pause() {
|
| @@ -290,8 +285,6 @@ void WebMediaPlayerCast::OnDisconnectedFromRemoteDevice() {
|
| DVLOG(1) << __FUNCTION__;
|
| if (!paused_) {
|
| paused_ = true;
|
| - if (delegate_)
|
| - delegate_->DidPause(webmediaplayer_);
|
| }
|
| is_remote_ = false;
|
| double t = currentTime();
|
| @@ -310,8 +303,6 @@ void WebMediaPlayerCast::OnMediaPlayerPlay() {
|
| initializing_ = false;
|
| if (is_remote_ && paused_) {
|
| paused_ = false;
|
| - if (paused_)
|
| - delegate_->DidPlay(webmediaplayer_);
|
| remote_time_at_ = base::TimeTicks::Now();
|
| client_->playbackStateChanged();
|
| }
|
| @@ -324,8 +315,6 @@ void WebMediaPlayerCast::OnMediaPlayerPause() {
|
| DVLOG(1) << __FUNCTION__ << " is_remote_ = " << is_remote_;
|
| if (is_remote_ && !paused_) {
|
| paused_ = true;
|
| - if (delegate_)
|
| - delegate_->DidPause(webmediaplayer_);
|
| client_->playbackStateChanged();
|
| }
|
| }
|
|
|