Fold WebDataSource into BufferedDataSource.

webkit/media/buffered_data_source.h

 // Copyright (c) 2012 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 WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
 #define WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/data_source.h"
+#include "media/base/pipeline_status.h"
 #include "webkit/media/buffered_resource_loader.h"
 
+class MessageLoop;
+
 namespace media {
 class MediaLog;
 }
 
 namespace webkit_media {
 
-// This class may be created on any thread, and is callable from the render
-// thread as well as media-specific threads.
-class BufferedDataSource : public WebDataSource {
+// A data source capable of loading URLs and buffering the data using an
+// in-memory sliding window.

[Ami GONE FROM CHROMIUM, 2012/03/27 05:16:19]

doco ctor/dtor thread restrictions?  (I think this object must be created &
destroyed on the render thread, but I'm not sure)

[scherkus (not reviewing), 2012/03/27 14:10:06]

Done.

+class BufferedDataSource : public media::DataSource {

[Ami GONE FROM CHROMIUM, 2012/03/27 05:16:19]

How long till DataSource can become a pure interface?  (or die?)

[scherkus (not reviewing), 2012/03/27 14:10:06]

set_host() is the only non-pure-virtual method and the interface also includes
ref-counting -- it'd be nice to get rid of both

the only other DataSource implementations are:
  * FileDataSource (tests, tools)
  * MockDataSource (tests)
  * DataSourceLogger (tools)

...so mostly test/tool support code, however DataSource is relatively low on the
list of code that needs to be nuked other than BDS/BRL itself.

  public:
   BufferedDataSource(MessageLoop* render_loop,
                      WebKit::WebFrame* frame,
                      media::MediaLog* media_log);
 
   virtual ~BufferedDataSource();
 
+  // Initialize this object using |url|. This object calls |status_cb| when
+  // initialization has completed.
+  //
+  // Method called on the render thread.
+  void Initialize(const GURL& url,
+                  const media::PipelineStatusCB& status_cb);
+
+  // Returns true if the media resource has a single origin, false otherwise.
+  //
+  // Method called on the render thread.
+  bool HasSingleOrigin();
+
+  // Cancels initialization, any pending loaders, and any pending read calls
+  // from the demuxer. The caller is expected to release its reference to this
+  // object and never call it again.
+  //
+  // Method called on the render thread.
+  void Abort();
+
   // media::DataSource implementation.
   // Called from demuxer thread.
   virtual void set_host(media::DataSourceHost* host) OVERRIDE;
   virtual void Stop(const base::Closure& closure) OVERRIDE;
   virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
 
   virtual void Read(
       int64 position,
       size_t size,
       uint8* data,
       const media::DataSource::ReadCB& read_cb) OVERRIDE;
   virtual bool GetSize(int64* size_out) OVERRIDE;
   virtual bool IsStreaming() OVERRIDE;
   virtual void SetPreload(media::Preload preload) OVERRIDE;
   virtual void SetBitrate(int bitrate) OVERRIDE;
 
-  // webkit_glue::WebDataSource implementation.
-  virtual void Initialize(
-      const GURL& url, const media::PipelineStatusCB& initialize_cb) OVERRIDE;
-  virtual bool HasSingleOrigin() OVERRIDE;
-  virtual void Abort() OVERRIDE;
-
  protected:
   // A factory method to create a BufferedResourceLoader based on the read
   // parameters. We can override this file to object a mock
   // BufferedResourceLoader for testing.
   virtual BufferedResourceLoader* CreateResourceLoader(
       int64 first_byte_position, int64 last_byte_position);
 
  private:
   friend class BufferedDataSourceTest;
 
@@ skipping 141 matching lines @@
   float playback_rate_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_