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

Unified Diff: content/renderer/media/webmediaplayer_ms.h

Issue 294043015: Move creation of MediaStream renders from MediaStreamImpl to MediaStreamRenderFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed commments. Fixed build when enable_webrtc = 0 Created 6 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
Index: content/renderer/media/webmediaplayer_ms.h
diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h
index 4c1cdf2c2dc25fc18c70024a1a03bcaa885c1024..36623e26cd3a240144854e663ad291a0ab0d3874 100644
--- a/content/renderer/media/webmediaplayer_ms.h
+++ b/content/renderer/media/webmediaplayer_ms.h
@@ -31,7 +31,7 @@ class WebLayerImpl;
namespace content {
class MediaStreamAudioRenderer;
-class MediaStreamClient;
+class MediaStreamRendererFactory;
class VideoFrameProvider;
class WebMediaPlayerDelegate;
@@ -59,8 +59,8 @@ class WebMediaPlayerMS
WebMediaPlayerMS(blink::WebFrame* frame,
blink::WebMediaPlayerClient* client,
base::WeakPtr<WebMediaPlayerDelegate> delegate,
- MediaStreamClient* media_stream_client,
- media::MediaLog* media_log);
+ media::MediaLog* media_log,
+ scoped_ptr<MediaStreamRendererFactory> factory);
virtual ~WebMediaPlayerMS();
virtual void load(LoadType load_type,
@@ -151,8 +151,6 @@ class WebMediaPlayerMS
base::WeakPtr<WebMediaPlayerDelegate> delegate_;
- MediaStreamClient* media_stream_client_;
-
// Specify content:: to disambiguate from cc::.
scoped_refptr<content::VideoFrameProvider> video_frame_provider_;
bool paused_;
@@ -189,6 +187,8 @@ class WebMediaPlayerMS
scoped_refptr<media::MediaLog> media_log_;
+ scoped_ptr<MediaStreamRendererFactory> renderer_factory_;
+
DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
};
« no previous file with comments | « content/renderer/media/media_stream_renderer_factory.cc ('k') | content/renderer/media/webmediaplayer_ms.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698