Use maximum capacity instead of a ratio of capacity for BufferedResourceLoader.

webkit/media/buffered_resource_loader.cc

Index: webkit/media/buffered_resource_loader.cc
diff --git a/webkit/media/buffered_resource_loader.cc b/webkit/media/buffered_resource_loader.cc
index cfeda51d00cd0073e1171262f51190fa469e966e..81092e790b2b964b0041d75377f97c7666ff4d55 100644
--- a/webkit/media/buffered_resource_loader.cc
+++ b/webkit/media/buffered_resource_loader.cc
@@ -53,13 +53,6 @@ static const int kMaxBufferCapacity = 20 * kMegabyte;
 // location and will instead reset the request.
 static const int kForwardWaitThreshold = 2 * kMegabyte;
 
-// The lower bound on our buffer (expressed as a fraction of the buffer size)
-// where we'll disable deferring and continue downloading data.
-//
-// TODO(scherkus): refer to http://crbug.com/124719 for more discussion on
-// how we could improve our buffering logic.
-static const double kDisableDeferThreshold = 0.9;
-
 // Computes the suggested backward and forward capacity for the buffer
 // if one wants to play at |playback_rate| * the natural playback speed.
 // Use a value of 0 for |bitrate| if it is unknown.
@@ -625,7 +618,7 @@ bool BufferedResourceLoader::ShouldEnableDefer() const {
     case kReadThenDefer:
       return read_cb_.is_null();
 
-    // Defer if we've reached the max capacity of the threshold.
+    // Defer if we've reached max capacity.
     case kThresholdDefer:
       return buffer_.forward_bytes() >= buffer_.forward_capacity();
   }
@@ -649,14 +642,12 @@ bool BufferedResourceLoader::ShouldDisableDefer() const {
       return !read_cb_.is_null() && last_offset_ > buffer_.forward_bytes();
 
     // Disable deferring whenever our forward-buffered amount falls beneath our
-    // threshold.
+    // capacity.
     //
     // TODO(scherkus): refer to http://crbug.com/124719 for more discussion on

[Ami GONE FROM CHROMIUM, 2012/07/09 17:27:41]

still needed?

[scherkus (not reviewing), 2012/07/11 00:49:37]

Done.

     // how we could improve our buffering logic.
     case kThresholdDefer: {

[Ami GONE FROM CHROMIUM, 2012/07/09 17:27:41]

braces no longer necessary

[scherkus (not reviewing), 2012/07/11 00:49:37]

Done.

-      int buffered = buffer_.forward_bytes();
-      int threshold = buffer_.forward_capacity() * kDisableDeferThreshold;
-      return buffered < threshold;
+      return buffer_.forward_bytes() < buffer_.forward_capacity();
     }
   }