| Index: webkit/glue/webmediaplayer_impl.cc
|
| diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
|
| index 76a99093b2c8c518153216cc69a39ab826d2bde8..4676b74a03c0f17705ea6a5d0f74ef8f5819ab08 100644
|
| --- a/webkit/glue/webmediaplayer_impl.cc
|
| +++ b/webkit/glue/webmediaplayer_impl.cc
|
| @@ -319,7 +319,8 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
|
| WebKit::WebMediaPlayerClient* client,
|
| media::FilterCollection* collection,
|
| media::MessageLoopFactory* message_loop_factory,
|
| - MediaStreamClient* media_stream_client)
|
| + MediaStreamClient* media_stream_client,
|
| + media::MediaLog* media_log)
|
| : network_state_(WebKit::WebMediaPlayer::Empty),
|
| ready_state_(WebKit::WebMediaPlayer::HaveNothing),
|
| main_loop_(NULL),
|
| @@ -331,10 +332,12 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
|
| playback_rate_(0.0f),
|
| client_(client),
|
| proxy_(NULL),
|
| - media_stream_client_(media_stream_client) {
|
| + media_stream_client_(media_stream_client),
|
| + media_log_(media_log) {
|
| // Saves the current message loop.
|
| DCHECK(!main_loop_);
|
| main_loop_ = MessageLoop::current();
|
| + media_log_->AddEventOfType(media::MediaLog::CREATED);
|
| }
|
|
|
| bool WebMediaPlayerImpl::Initialize(
|
| @@ -421,6 +424,7 @@ bool WebMediaPlayerImpl::Initialize(
|
| }
|
|
|
| WebMediaPlayerImpl::~WebMediaPlayerImpl() {
|
| + media_log_->AddEventOfType(media::MediaLog::DESTROYED);
|
| Destroy();
|
|
|
| // Finally tell the |main_loop_| we don't want to be notified of destruction
|
| @@ -458,6 +462,8 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url) {
|
| url.spec(),
|
| NewCallback(proxy_.get(),
|
| &WebMediaPlayerImpl::Proxy::PipelineInitializationCallback));
|
| +
|
| + media_log_->Load(url.spec());
|
| }
|
|
|
| void WebMediaPlayerImpl::cancelLoad() {
|
| @@ -469,6 +475,8 @@ void WebMediaPlayerImpl::play() {
|
|
|
| paused_ = false;
|
| pipeline_->SetPlaybackRate(playback_rate_);
|
| +
|
| + media_log_->AddEventOfType(media::MediaLog::PLAY);
|
| }
|
|
|
| void WebMediaPlayerImpl::pause() {
|
| @@ -477,6 +485,8 @@ void WebMediaPlayerImpl::pause() {
|
| paused_ = true;
|
| pipeline_->SetPlaybackRate(0.0f);
|
| paused_time_ = pipeline_->GetCurrentTime();
|
| +
|
| + media_log_->AddEventOfType(media::MediaLog::PAUSE);
|
| }
|
|
|
| bool WebMediaPlayerImpl::supportsFullscreen() const {
|
|
|