Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2151)

Unified Diff: content/shell/renderer/shell_video_frame_provider.h

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/renderer/shell_video_frame_provider.h
diff --git a/webkit/renderer/media/simple_video_frame_provider.h b/content/shell/renderer/shell_video_frame_provider.h
similarity index 71%
rename from webkit/renderer/media/simple_video_frame_provider.h
rename to content/shell/renderer/shell_video_frame_provider.h
index ea0ca9c6f7f865f1fd7647fb8721e86f095cf850..02d479e15cec76b4d0a6c0e17840f1a9c61c5d8a 100644
--- a/webkit/renderer/media/simple_video_frame_provider.h
+++ b/content/shell/renderer/shell_video_frame_provider.h
@@ -2,27 +2,27 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WEBKIT_RENDERER_MEDIA_SIMPLE_VIDEO_FRAME_PROVIDER_H_
-#define WEBKIT_RENDERER_MEDIA_SIMPLE_VIDEO_FRAME_PROVIDER_H_
+#ifndef CONTENT_RENDERER_MEDIA_SHELL_VIDEO_FRAME_PROVIDER_H_
+#define CONTENT_RENDERER_MEDIA_SHELL_VIDEO_FRAME_PROVIDER_H_
#include "base/time.h"
+#include "content/renderer/media/video_frame_provider.h"
#include "ui/gfx/size.h"
-#include "webkit/renderer/media/video_frame_provider.h"
namespace base {
class MessageLoopProxy;
}
-namespace webkit_media {
+namespace content {
// A simple implementation of VideoFrameProvider generates raw frames and
// passes them to webmediaplayer.
// Since non-black pixel values are required in the layout test, e.g.,
// media/video-capture-canvas.html, this class should generate frame with
// only non-black pixels.
-class SimpleVideoFrameProvider : public VideoFrameProvider {
+class ShellVideoFrameProvider : public VideoFrameProvider {
public:
- SimpleVideoFrameProvider(
+ ShellVideoFrameProvider(
const gfx::Size& size,
const base::TimeDelta& frame_duration,
const base::Closure& error_cb,
@@ -35,7 +35,7 @@ class SimpleVideoFrameProvider : public VideoFrameProvider {
virtual void Pause() OVERRIDE;
protected:
- virtual ~SimpleVideoFrameProvider();
+ virtual ~ShellVideoFrameProvider();
private:
enum State {
@@ -55,9 +55,9 @@ class SimpleVideoFrameProvider : public VideoFrameProvider {
base::Closure error_cb_;
RepaintCB repaint_cb_;
- DISALLOW_COPY_AND_ASSIGN(SimpleVideoFrameProvider);
+ DISALLOW_COPY_AND_ASSIGN(ShellVideoFrameProvider);
};
-} // namespace webkit_media
+} // namespace content
-#endif // WEBKIT_RENDERER_MEDIA_SIMPLE_VIDEO_FRAME_PROVIDER_H_
+#endif // CONTENT_RENDERER_MEDIA_SHELL_VIDEO_FRAME_PROVIDER_H_

Powered by Google App Engine
This is Rietveld 408576698