Merge 21982 - Retry requests that has timed out in BufferedDataSource...

webkit/glue/media/buffered_data_source.h

Index: webkit/glue/media/buffered_data_source.h
===================================================================
--- webkit/glue/media/buffered_data_source.h	(revision 22809)
+++ webkit/glue/media/buffered_data_source.h	(working copy)
@@ -9,6 +9,7 @@
 
 #include "base/lock.h"
 #include "base/scoped_ptr.h"
+#include "base/timer.h"
 #include "base/condition_variable.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/factory.h"
@@ -183,6 +184,11 @@
   virtual BufferedResourceLoader* CreateLoader(int64 first_byte_position,
                                                int64 last_byte_position);
 
+  // Gets the number of milliseconds to declare a request timeout since
+  // the request was made. This method is made virtual so as to inject a
+  // different number for testing purpose.
+  virtual base::TimeDelta GetTimeoutMilliseconds();
+
  private:
   friend class media::FilterFactoryImpl2<
       BufferedDataSource,
@@ -205,6 +211,11 @@
   // callback method from the current buffered resource loader.
   void SwapLoaderTask(BufferedResourceLoader* loader);
 
+  // This task monitors the current active read request. If the current read
+  // request has timed out, this task will destroy the current loader and
+  // creates a new to accomodate the read request.
+  void WatchDogTask();
+
   // The method that performs actual read. This method can only be executed on
   // the render thread.
   void ReadInternal();
@@ -252,6 +263,8 @@
   int64 read_position_;
   int read_size_;
   uint8* read_buffer_;
+  base::Time read_submitted_time_;
+  int read_attempts_;
 
   // This buffer is intermediate, we use it for BufferedResourceLoader to write
   // to. And when read in BufferedResourceLoader is done, we copy data from
@@ -278,6 +291,12 @@
   // Stop signal to suppressing activities.
   bool stopped_;
 
+  // This timer is to run the WatchDogTask repeatedly. We use a timer instead
+  // of doing PostDelayedTask() reduce the extra reference held by the message
+  // loop. The RepeatingTimer does PostDelayedTask() internally, by using it
+  // the message loop doesn't hold a reference for the watch dog task.
+  base::RepeatingTimer<BufferedDataSource> watch_dog_timer_;
+
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
 };
 
Property changes on: webkit\glue\media\buffered_data_source.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/webkit/glue/media/buffered_data_source.h:r21982