Index: media/blink/buffered_resource_loader.h |
diff --git a/content/renderer/media/buffered_resource_loader.h b/media/blink/buffered_resource_loader.h |
similarity index 95% |
rename from content/renderer/media/buffered_resource_loader.h |
rename to media/blink/buffered_resource_loader.h |
index 3bdf1388c7f6c00c7d0c88628aca4bb9e5b63b25..fb633bed3e799fa05a089b460fc92d444deef03b 100644 |
--- a/content/renderer/media/buffered_resource_loader.h |
+++ b/media/blink/buffered_resource_loader.h |
@@ -2,17 +2,17 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_RENDERER_MEDIA_BUFFERED_RESOURCE_LOADER_H_ |
-#define CONTENT_RENDERER_MEDIA_BUFFERED_RESOURCE_LOADER_H_ |
+#ifndef MEDIA_BLINK_BUFFERED_RESOURCE_LOADER_H_ |
+#define MEDIA_BLINK_BUFFERED_RESOURCE_LOADER_H_ |
#include <string> |
#include "base/callback.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/timer/timer.h" |
-#include "content/common/content_export.h" |
-#include "content/renderer/media/active_loader.h" |
+#include "media/base/media_export.h" |
#include "media/base/seekable_buffer.h" |
+#include "media/blink/active_loader.h" |
#include "third_party/WebKit/public/platform/WebURLLoader.h" |
#include "third_party/WebKit/public/platform/WebURLLoaderClient.h" |
#include "third_party/WebKit/public/platform/WebURLRequest.h" |
@@ -22,9 +22,6 @@ |
namespace media { |
class MediaLog; |
class SeekableBuffer; |
-} |
- |
-namespace content { |
const int64 kPositionNotSpecified = -1; |
@@ -32,7 +29,7 @@ const int64 kPositionNotSpecified = -1; |
// render thread. It wraps a WebURLLoader and does in-memory buffering, |
// pausing resource loading when the in-memory buffer is full and resuming |
// resource loading when there is available capacity. |
-class CONTENT_EXPORT BufferedResourceLoader |
+class MEDIA_EXPORT BufferedResourceLoader |
: NON_EXPORTED_BASE(public blink::WebURLLoaderClient) { |
public: |
// kNeverDefer - Aggresively buffer; never defer loading while paused. |
@@ -90,7 +87,7 @@ class CONTENT_EXPORT BufferedResourceLoader |
DeferStrategy strategy, |
int bitrate, |
float playback_rate, |
- media::MediaLog* media_log); |
+ MediaLog* media_log); |
virtual ~BufferedResourceLoader(); |
// Start the resource loading with the specified URL and range. |
@@ -251,7 +248,7 @@ class CONTENT_EXPORT BufferedResourceLoader |
void Log(); |
// A sliding window of buffer. |
- media::SeekableBuffer buffer_; |
+ SeekableBuffer buffer_; |
// Keeps track of an active WebURLLoader and associated state. |
scoped_ptr<ActiveLoader> active_loader_; |
@@ -271,7 +268,7 @@ class CONTENT_EXPORT BufferedResourceLoader |
bool range_supported_; |
// Forward capacity to reset to after an extension. |
- size_t saved_forward_capacity_; |
+ int saved_forward_capacity_; |
GURL url_; |
CORSMode cors_mode_; |
@@ -313,11 +310,11 @@ class CONTENT_EXPORT BufferedResourceLoader |
// Playback rate of the media. |
float playback_rate_; |
- scoped_refptr<media::MediaLog> media_log_; |
+ scoped_refptr<MediaLog> media_log_; |
DISALLOW_COPY_AND_ASSIGN(BufferedResourceLoader); |
}; |
-} // namespace content |
+} // namespace media |
-#endif // CONTENT_RENDERER_MEDIA_BUFFERED_RESOURCE_LOADER_H_ |
+#endif // MEDIA_BLINK_BUFFERED_RESOURCE_LOADER_H_ |