| Index: webkit/glue/webmediaplayer_impl.cc
|
| diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
|
| index 30af6d66abd306a12c7f529665af0dd7ea616de3..2b6441bf00da33f9bf79c3edad3c533d55f65aec 100644
|
| --- a/webkit/glue/webmediaplayer_impl.cc
|
| +++ b/webkit/glue/webmediaplayer_impl.cc
|
| @@ -338,7 +338,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
|
| // Saves the current message loop.
|
| DCHECK(!main_loop_);
|
| main_loop_ = MessageLoop::current();
|
| - media_log_->AddEventOfType(media::MediaLogEvent::CREATING);
|
| + media_log_->AddEventOfType(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED);
|
| }
|
|
|
| bool WebMediaPlayerImpl::Initialize(
|
| @@ -352,7 +352,7 @@ bool WebMediaPlayerImpl::Initialize(
|
| return false;
|
| }
|
|
|
| - pipeline_ = new media::PipelineImpl(pipeline_message_loop);
|
| + pipeline_ = new media::PipelineImpl(pipeline_message_loop, media_log_);
|
|
|
| // Also we want to be notified of |main_loop_| destruction.
|
| main_loop_->AddDestructionObserver(this);
|
| @@ -425,8 +425,8 @@ bool WebMediaPlayerImpl::Initialize(
|
| }
|
|
|
| WebMediaPlayerImpl::~WebMediaPlayerImpl() {
|
| - media_log_->AddEventOfType(media::MediaLogEvent::DESTROYING);
|
| Destroy();
|
| + media_log_->AddEventOfType(media::MediaLogEvent::WEBMEDIAPLAYER_DESTROYED);
|
|
|
| // Finally tell the |main_loop_| we don't want to be notified of destruction
|
| // event.
|
| @@ -515,6 +515,8 @@ void WebMediaPlayerImpl::seek(float seconds) {
|
| return;
|
| }
|
|
|
| + media_log_->Seek(seconds);
|
| +
|
| base::TimeDelta seek_time = ConvertSecondsToTimestamp(seconds);
|
|
|
| // Update our paused time.
|
|
|