content/shell/renderer/layout_test/test_media_stream_renderer_factory.cc - Issue 2005053006: Cleanup naming issue with content::VideoFrameProvider

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/layout_test/test_media_stream_renderer_factory.cc

Issue 2005053006: Cleanup naming issue with content::VideoFrameProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address Comments Created 4 years, 7 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

« no previous file with comments | « content/shell/renderer/layout_test/test_media_stream_renderer_factory.h ('k') | content/shell/renderer/layout_test/test_media_stream_video_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/renderer/layout_test/test_media_stream_renderer_factory.cc

diff --git a/content/shell/renderer/layout_test/test_media_stream_renderer_factory.cc b/content/shell/renderer/layout_test/test_media_stream_renderer_factory.cc

index 641b38cb8a994914988ea60f7a4d8b5720c80ac3..741879f1211f890bae68f54ae7b55c3185372358 100644

--- a/content/shell/renderer/layout_test/test_media_stream_renderer_factory.cc

+++ b/content/shell/renderer/layout_test/test_media_stream_renderer_factory.cc

@@ -4,7 +4,7 @@

#include "content/shell/renderer/layout_test/test_media_stream_renderer_factory.h"

-#include "content/shell/renderer/layout_test/test_video_frame_provider.h"

+#include "content/shell/renderer/layout_test/test_media_stream_video_renderer.h"

#include "third_party/WebKit/public/platform/WebMediaStream.h"

#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"

#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"

@@ -38,18 +38,18 @@ TestMediaStreamRendererFactory::TestMediaStreamRendererFactory() {}

TestMediaStreamRendererFactory::~TestMediaStreamRendererFactory() {}

-scoped_refptr<VideoFrameProvider>

-TestMediaStreamRendererFactory::GetVideoFrameProvider(

+scoped_refptr<MediaStreamVideoRenderer>

+TestMediaStreamRendererFactory::GetVideoRenderer(

const blink::WebMediaStream& web_stream,

const base::Closure& error_cb,

- const VideoFrameProvider::RepaintCB& repaint_cb,

+ const MediaStreamVideoRenderer::RepaintCB& repaint_cb,

const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,

const scoped_refptr<base::TaskRunner>& worker_task_runner,

media::GpuVideoAcceleratorFactories* gpu_factories) {

if (!IsMockMediaStreamWithVideo(web_stream))

return NULL;

- return new TestVideoFrameProvider(

+ return new TestMediaStreamVideoRenderer(

gfx::Size(kVideoCaptureWidth, kVideoCaptureHeight),

base::TimeDelta::FromMilliseconds(kVideoCaptureFrameDurationMs),

error_cb,