| Index: content/renderer/media/video_frame_provider.h
|
| diff --git a/webkit/renderer/media/video_frame_provider.h b/content/renderer/media/video_frame_provider.h
|
| similarity index 75%
|
| rename from webkit/renderer/media/video_frame_provider.h
|
| rename to content/renderer/media/video_frame_provider.h
|
| index 8882eb1cb37e5271cdbee1527c158fa08b99d4f2..8d9278fd68da3a529c520c75dc4dfa5adfdfe00f 100644
|
| --- a/webkit/renderer/media/video_frame_provider.h
|
| +++ b/content/renderer/media/video_frame_provider.h
|
| @@ -2,21 +2,23 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_RENDERER_MEDIA_VIDEO_FRAME_PROVIDER_H_
|
| -#define WEBKIT_RENDERER_MEDIA_VIDEO_FRAME_PROVIDER_H_
|
| +#ifndef CONTENT_RENDERER_MEDIA_VIDEO_FRAME_PROVIDER_H_
|
| +#define CONTENT_RENDERER_MEDIA_VIDEO_FRAME_PROVIDER_H_
|
|
|
| #include "base/callback.h"
|
| #include "base/memory/ref_counted.h"
|
| +#include "content/common/content_export.h"
|
|
|
| namespace media {
|
| class VideoFrame;
|
| }
|
|
|
| -namespace webkit_media {
|
| +namespace content {
|
|
|
| // Define an interface to provide a sequence of video frames to clients.
|
| // TODO(wjia): remove ref count.
|
| -class VideoFrameProvider
|
| +// TODO(wjia): rename interface so it doesn't clash with cc::VideoFrameProvider.
|
| +class CONTENT_EXPORT VideoFrameProvider
|
| : public base::RefCountedThreadSafe<VideoFrameProvider> {
|
| public:
|
| typedef base::Callback<void(const scoped_refptr<media::VideoFrame>&)>
|
| @@ -38,6 +40,7 @@ class VideoFrameProvider
|
|
|
| protected:
|
| friend class base::RefCountedThreadSafe<VideoFrameProvider>;
|
| +
|
| VideoFrameProvider();
|
| virtual ~VideoFrameProvider();
|
|
|
| @@ -45,6 +48,6 @@ class VideoFrameProvider
|
| DISALLOW_COPY_AND_ASSIGN(VideoFrameProvider);
|
| };
|
|
|
| -} // namespace webkit_media
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_RENDERER_MEDIA_VIDEO_FRAME_PROVIDER_H_
|
| +#endif // CONTENT_RENDERER_MEDIA_VIDEO_FRAME_PROVIDER_H_
|
|
|