Log BufferedResourceLoader events to MediaLog.

webkit/glue/webmediaplayer_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 
 #include "base/callback.h"
@@ skipping 320 matching lines @@
       paused_(true),
       seeking_(false),
       playback_rate_(0.0f),
       client_(client),
       proxy_(NULL),
       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::MediaLogEvent::CREATING);
+  media_log_->AddEvent(media_log_->CreateEvent(media::MediaLogEvent::CREATING));
 }
 
 bool WebMediaPlayerImpl::Initialize(
     WebKit::WebFrame* frame,
     bool use_simple_data_source,
     scoped_refptr<WebVideoRenderer> web_video_renderer) {
   MessageLoop* pipeline_message_loop =
       message_loop_factory_->GetMessageLoop("PipelineThread");
   if (!pipeline_message_loop) {
     NOTREACHED() << "Could not start PipelineThread";
@@ skipping 15 matching lines @@
       NewCallback(proxy_.get(),
                   &WebMediaPlayerImpl::Proxy::PipelineEndedCallback),
       NewCallback(proxy_.get(),
                   &WebMediaPlayerImpl::Proxy::PipelineErrorCallback),
       NewCallback(proxy_.get(),
                   &WebMediaPlayerImpl::Proxy::NetworkEventCallback));
 
   // A simple data source that keeps all data in memory.
   scoped_ptr<media::DataSourceFactory> simple_data_source_factory(
       SimpleDataSource::CreateFactory(MessageLoop::current(), frame,
+                                      media_log_,
                                       proxy_->GetBuildObserver()));
 
   // A sophisticated data source that does memory caching.
   scoped_ptr<media::DataSourceFactory> buffered_data_source_factory(
       BufferedDataSource::CreateFactory(MessageLoop::current(), frame,
+                                        media_log_,
                                         proxy_->GetBuildObserver()));
 
   scoped_ptr<media::CompositeDataSourceFactory> data_source_factory(
       new media::CompositeDataSourceFactory());
 
   if (use_simple_data_source) {
     data_source_factory->AddFactory(simple_data_source_factory.release());
     data_source_factory->AddFactory(buffered_data_source_factory.release());
   } else {
     data_source_factory->AddFactory(buffered_data_source_factory.release());
@@ skipping 26 matching lines @@
   filter_collection_->AddAudioDecoder(new media::FFmpegAudioDecoder(
       message_loop_factory_->GetMessageLoop("AudioDecoderThread")));
   filter_collection_->AddVideoDecoder(new media::FFmpegVideoDecoder(
       message_loop_factory_->GetMessageLoop("VideoDecoderThread"), NULL));
   filter_collection_->AddAudioRenderer(new media::NullAudioRenderer());
 
   return true;
 }
 
 WebMediaPlayerImpl::~WebMediaPlayerImpl() {
-  media_log_->AddEventOfType(media::MediaLogEvent::DESTROYING);
+  media_log_->AddEvent(
+      media_log_->CreateEvent(media::MediaLogEvent::DESTROYING));
   Destroy();
 
   // Finally tell the |main_loop_| we don't want to be notified of destruction
   // event.
   if (main_loop_) {
     main_loop_->RemoveDestructionObserver(this);
   }
 }
 
 void WebMediaPlayerImpl::load(const WebKit::WebURL& url) {
@@ skipping 18 matching lines @@
 
   // Initialize the pipeline.
   SetNetworkState(WebKit::WebMediaPlayer::Loading);
   SetReadyState(WebKit::WebMediaPlayer::HaveNothing);
   pipeline_->Start(
       filter_collection_.release(),
       url.spec(),
       NewCallback(proxy_.get(),
                   &WebMediaPlayerImpl::Proxy::PipelineInitializationCallback));
 
-  media_log_->Load(url.spec());
+  media_log_->AddEvent(media_log_->CreateLoadEvent(url.spec()));
 }
 
 void WebMediaPlayerImpl::cancelLoad() {
   DCHECK(MessageLoop::current() == main_loop_);
 }
 
 void WebMediaPlayerImpl::play() {
   DCHECK(MessageLoop::current() == main_loop_);
 
   paused_ = false;
   pipeline_->SetPlaybackRate(playback_rate_);
 
-  media_log_->AddEventOfType(media::MediaLogEvent::PLAY);
+  media_log_->AddEvent(media_log_->CreateEvent(media::MediaLogEvent::PLAY));
 }
 
 void WebMediaPlayerImpl::pause() {
   DCHECK(MessageLoop::current() == main_loop_);
 
   paused_ = true;
   pipeline_->SetPlaybackRate(0.0f);
   paused_time_ = pipeline_->GetCurrentTime();
 
-  media_log_->AddEventOfType(media::MediaLogEvent::PAUSE);
+  media_log_->AddEvent(media_log_->CreateEvent(media::MediaLogEvent::PAUSE));
 }
 
 bool WebMediaPlayerImpl::supportsFullscreen() const {
   DCHECK(MessageLoop::current() == main_loop_);
   return true;
 }
 
 bool WebMediaPlayerImpl::supportsSave() const {
   DCHECK(MessageLoop::current() == main_loop_);
   return true;
@@ skipping 542 matching lines @@
   }
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_glue