| Index: content/renderer/media/buffered_resource_loader.h
|
| diff --git a/webkit/renderer/media/buffered_resource_loader.h b/content/renderer/media/buffered_resource_loader.h
|
| similarity index 96%
|
| rename from webkit/renderer/media/buffered_resource_loader.h
|
| rename to content/renderer/media/buffered_resource_loader.h
|
| index 89d2b79ee18cd1da0dbe58c5d98ec8b3e2de6e14..7797345392ede5c91d499eec0d8a6d0137125d8f 100644
|
| --- a/webkit/renderer/media/buffered_resource_loader.h
|
| +++ b/content/renderer/media/buffered_resource_loader.h
|
| @@ -2,28 +2,29 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_RENDERER_MEDIA_BUFFERED_RESOURCE_LOADER_H_
|
| -#define WEBKIT_RENDERER_MEDIA_BUFFERED_RESOURCE_LOADER_H_
|
| +#ifndef CONTENT_RENDERER_MEDIA_BUFFERED_RESOURCE_LOADER_H_
|
| +#define CONTENT_RENDERER_MEDIA_BUFFERED_RESOURCE_LOADER_H_
|
|
|
| #include <string>
|
|
|
| #include "base/callback.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/timer.h"
|
| +#include "content/common/content_export.h"
|
| +#include "content/renderer/media/active_loader.h"
|
| #include "googleurl/src/gurl.h"
|
| #include "media/base/seekable_buffer.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"
|
| #include "third_party/WebKit/public/web/WebFrame.h"
|
| -#include "webkit/renderer/media/active_loader.h"
|
|
|
| namespace media {
|
| class MediaLog;
|
| class SeekableBuffer;
|
| }
|
|
|
| -namespace webkit_media {
|
| +namespace content {
|
|
|
| const int64 kPositionNotSpecified = -1;
|
|
|
| @@ -34,7 +35,8 @@ const char kHttpsScheme[] = "https";
|
| // 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 BufferedResourceLoader : public WebKit::WebURLLoaderClient {
|
| +class CONTENT_EXPORT BufferedResourceLoader
|
| + : public WebKit::WebURLLoaderClient {
|
| public:
|
| // kNeverDefer - Aggresively buffer; never defer loading while paused.
|
| // kReadThenDefer - Request only enough data to fulfill read requests.
|
| @@ -326,6 +328,6 @@ class BufferedResourceLoader : public WebKit::WebURLLoaderClient {
|
| DISALLOW_COPY_AND_ASSIGN(BufferedResourceLoader);
|
| };
|
|
|
| -} // namespace webkit_media
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_RENDERER_MEDIA_BUFFERED_RESOURCE_LOADER_H_
|
| +#endif // CONTENT_RENDERER_MEDIA_BUFFERED_RESOURCE_LOADER_H_
|
|
|