content/shell/renderer/shell_video_frame_provider.h - Issue 18590002: Migrate MediaStream test code from content/shell/renderer/ to content/test/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 18590002: Migrate MediaStream test code from content/shell/renderer/ to content/test/. (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

« content/shell/renderer/shell_media_stream_client.h ('K') | « content/shell/renderer/shell_media_stream_client.cc ('k') | webkit/renderer/media/active_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/renderer/shell_video_frame_provider.h

diff --git a/content/shell/renderer/shell_video_frame_provider.h b/content/shell/renderer/shell_video_frame_provider.h

index fdcc866c6701347afdafd61a50993b5f7d0956a5..5c64548f14a3e800459277a9c1568dc5aff58568 100644

--- a/content/shell/renderer/shell_video_frame_provider.h

+++ b/content/shell/renderer/shell_video_frame_provider.h

@@ -6,8 +6,8 @@

#define CONTENT_RENDERER_MEDIA_SHELL_VIDEO_FRAME_PROVIDER_H_

#include "base/time/time.h"

+#include "content/public/renderer/video_frame_provider.h"

#include "ui/gfx/size.h"

-#include "webkit/renderer/media/video_frame_provider.h"

namespace base {

class MessageLoopProxy;

@@ -20,7 +20,7 @@ namespace content {

// 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 ShellVideoFrameProvider : public webkit_media::VideoFrameProvider {

+class ShellVideoFrameProvider : public VideoFrameProvider {

public:

ShellVideoFrameProvider(

const gfx::Size& size,