Merge M50: "Disable "pause-and-buffer" on Android, cancel suspended players."

media/blink/buffered_data_source.h

 // Copyright 2013 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.
 
 #ifndef MEDIA_BLINK_BUFFERED_DATA_SOURCE_H_
 #define MEDIA_BLINK_BUFFERED_DATA_SOURCE_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 87 matching lines @@
 
   // Notifies changes in playback state for controlling media buffering
   // behavior.
   virtual void MediaPlaybackRateChanged(double playback_rate) = 0;
   virtual void MediaIsPlaying() = 0;
   virtual bool media_has_played() const = 0;
 
   // Returns true if the resource is local.
   virtual bool assume_fully_buffered() = 0;
 
-  // Cancels any open network connections once reaching the deferred state for
-  // preload=metadata, non-streaming resources that have not started playback.
-  // If already deferred, connections will be immediately closed.
-  virtual void OnBufferingHaveEnough() = 0;
+  // Cancels any open network connections once reaching the deferred state. If
+  // |always_cancel| is false this is done only for preload=metadata, non-
+  // streaming resources that have not started playback. If |always_cancel| is
+  // true, all resource types will have their connections canceled. If already
+  // deferred, connections will be immediately closed.
+  virtual void OnBufferingHaveEnough(bool always_cancel) = 0;
 
   // Returns an estimate of the number of bytes held by the data source.
   virtual int64_t GetMemoryUsage() const = 0;
 };
 
 // A data source capable of loading URLs and buffering the data using an
 // in-memory sliding window.
 //
 // BufferedDataSource must be created and destroyed on the thread associated
 // with the |task_runner| passed in the constructor.
@@ skipping 49 matching lines @@
 
   // Notifies changes in playback state for controlling media buffering
   // behavior.
   void MediaPlaybackRateChanged(double playback_rate) override;
   void MediaIsPlaying() override;
   bool media_has_played() const override;
 
   // Returns true if the resource is local.
   bool assume_fully_buffered() override;
 
-  // Cancels any open network connections once reaching the deferred state for
-  // preload=metadata, non-streaming resources that have not started playback.
-  // If already deferred, connections will be immediately closed.
-  void OnBufferingHaveEnough() override;
+  // Cancels any open network connections once reaching the deferred state. If
+  // |always_cancel| is false this is done only for preload=metadata, non-
+  // streaming resources that have not started playback. If |always_cancel| is
+  // true, all resource types will have their connections canceled. If already
+  // deferred, connections will be immediately closed.
+  void OnBufferingHaveEnough(bool always_cancel) override;
 
   // Returns an estimate of the number of bytes held by the data source.
   int64_t GetMemoryUsage() const override;
 
   // DataSource implementation.
   // Called from demuxer thread.
   void Stop() override;
 
   void Read(int64_t position,
             int size,
@@ skipping 134 matching lines @@
   // reaching into this class from multiple threads to attain a WeakPtr.
   base::WeakPtr<BufferedDataSource> weak_ptr_;
   base::WeakPtrFactory<BufferedDataSource> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_BUFFERED_DATA_SOURCE_H_