Log BufferedResourceLoader events to MediaLog.

webkit/glue/media/buffered_resource_loader.cc

Index: webkit/glue/media/buffered_resource_loader.cc
diff --git a/webkit/glue/media/buffered_resource_loader.cc b/webkit/glue/media/buffered_resource_loader.cc
index 6522726af486aa08c0e418e375e096cc7e811901..e3a9ec30e06e3d90683fb6b1e3202615804f7e71 100644
--- a/webkit/glue/media/buffered_resource_loader.cc
+++ b/webkit/glue/media/buffered_resource_loader.cc
@@ -7,6 +7,7 @@
 #include "base/format_macros.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
+#include "media/base/media_log.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_request_headers.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
@@ -54,7 +55,8 @@ static const int kForwardWaitThreshold = 2 * kMegabyte;
 BufferedResourceLoader::BufferedResourceLoader(
     const GURL& url,
     int64 first_byte_position,
-    int64 last_byte_position)
+    int64 last_byte_position,
+    media::MediaLog* media_log)
     : buffer_(new media::SeekableBuffer(kBackwardCapacity, kForwardCapacity)),
       deferred_(false),
       defer_strategy_(kReadThenDefer),
@@ -76,7 +78,8 @@ BufferedResourceLoader::BufferedResourceLoader(
       read_buffer_(NULL),
       first_offset_(0),
       last_offset_(0),
-      keep_test_loader_(false) {
+      keep_test_loader_(false),
+      media_log_(media_log) {
 }
 
 BufferedResourceLoader::~BufferedResourceLoader() {
@@ -399,6 +402,7 @@ void BufferedResourceLoader::didReceiveData(
 
   // Notify that we have received some data.
   NotifyNetworkEvent();
+  Log();
 }
 
 void BufferedResourceLoader::didDownloadData(
@@ -677,6 +681,7 @@ void BufferedResourceLoader::DoneRead(int error) {
   read_buffer_ = NULL;
   first_offset_ = 0;
   last_offset_ = 0;
+  Log();
 }
 
 void BufferedResourceLoader::DoneStart(int error) {
@@ -693,4 +698,12 @@ bool BufferedResourceLoader::IsRangeRequest() const {
   return first_byte_position_ != kPositionNotSpecified;
 }
 
+void BufferedResourceLoader::Log() {
+  if (buffer_.get()) {

[scherkus (not reviewing), 2011/08/08 23:18:25]

so is media_log a required param or not?

if it's refcounted, when would it be NULL?

[Scott Franklin, 2011/08/09 00:27:27]

That's a check for buffer_, which is null surprisingly often. At this point the
check is only necessary on the second Log() invocation above, so it could go
there instead, but that could conceivably change in the future.

+    media_log_->SetBufferedExtents(offset_ - buffer_->backward_bytes(),
+                                   offset_,
+                                   offset_ + buffer_->forward_bytes());
+  }
+}
+
 }  // namespace webkit_glue