summaryrefslogtreecommitdiffstats
path: root/webkit/glue/media/buffered_data_source.cc
diff options
context:
space:
mode:
authorscottfr@chromium.org <scottfr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-09 17:53:45 +0000
committerscottfr@chromium.org <scottfr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-09 17:53:45 +0000
commit24d75c714285a0c31b5e688a7c97fbc883e389c9 (patch)
treef908b22afc362f392ba02ac3a9a47175bca83a1d /webkit/glue/media/buffered_data_source.cc
parent381455c05cb4f766d36cd99bb3fabde3e0d5246b (diff)
downloadchromium_src-24d75c714285a0c31b5e688a7c97fbc883e389c9.zip
chromium_src-24d75c714285a0c31b5e688a7c97fbc883e389c9.tar.gz
chromium_src-24d75c714285a0c31b5e688a7c97fbc883e389c9.tar.bz2
Log BufferedResourceLoader events to MediaLog.
BUG= TEST= Review URL: http://codereview.chromium.org/7591001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/media/buffered_data_source.cc')
-rw-r--r--webkit/glue/media/buffered_data_source.cc20
1 files changed, 13 insertions, 7 deletions
diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc
index c125dd6..ce0ddce 100644
--- a/webkit/glue/media/buffered_data_source.cc
+++ b/webkit/glue/media/buffered_data_source.cc
@@ -5,6 +5,7 @@
#include "webkit/glue/media/buffered_data_source.h"
#include "media/base/filter_host.h"
+#include "media/base/media_log.h"
#include "net/base/net_errors.h"
#include "webkit/glue/media/web_data_source_factory.h"
#include "webkit/glue/webkit_glue.h"
@@ -23,22 +24,25 @@ static const int kInitialReadBufferSize = 32768;
static const int kNumCacheMissRetries = 3;
static WebDataSource* NewBufferedDataSource(MessageLoop* render_loop,
- WebKit::WebFrame* frame) {
- return new BufferedDataSource(render_loop, frame);
+ WebKit::WebFrame* frame,
+ media::MediaLog* media_log) {
+ return new BufferedDataSource(render_loop, frame, media_log);
}
// static
media::DataSourceFactory* BufferedDataSource::CreateFactory(
MessageLoop* render_loop,
WebKit::WebFrame* frame,
+ media::MediaLog* media_log,
WebDataSourceBuildObserverHack* build_observer) {
- return new WebDataSourceFactory(render_loop, frame, &NewBufferedDataSource,
- build_observer);
+ return new WebDataSourceFactory(render_loop, frame, media_log,
+ &NewBufferedDataSource, build_observer);
}
BufferedDataSource::BufferedDataSource(
MessageLoop* render_loop,
- WebFrame* frame)
+ WebFrame* frame,
+ media::MediaLog* media_log)
: total_bytes_(kPositionNotSpecified),
buffered_bytes_(0),
loaded_(false),
@@ -60,7 +64,8 @@ BufferedDataSource::BufferedDataSource(
media_has_played_(false),
preload_(media::METADATA),
using_range_request_(true),
- cache_miss_retries_left_(kNumCacheMissRetries) {
+ cache_miss_retries_left_(kNumCacheMissRetries),
+ media_log_(media_log) {
}
BufferedDataSource::~BufferedDataSource() {}
@@ -74,7 +79,8 @@ BufferedResourceLoader* BufferedDataSource::CreateResourceLoader(
return new BufferedResourceLoader(url_,
first_byte_position,
- last_byte_position);
+ last_byte_position,
+ media_log_);
}
void BufferedDataSource::set_host(media::FilterHost* host) {