Merge WebMediaStreamRendererFactory and MediaStreamRendererFactoryImpl

... into MediaStreamRendererFactory.

The implementation will now reside in media_stream_renderer_factory.cc|h.

BUG=704136, 919392
R=guidou@chromium.org, haraken@chromium.org

Change-Id: I6d254aaca5b42ed170ca84218770f80843ef7e3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2302918
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789474}

content/shell/renderer/web_test/web_test_content_renderer_client.cc

@@ -30,7 +30,6 @@
 #include "third_party/blink/public/platform/web_audio_latency_hint.h"
 #include "third_party/blink/public/platform/web_runtime_features.h"
 #include "third_party/blink/public/web/blink.h"
-#include "third_party/blink/public/web/modules/mediastream/web_media_stream_renderer_factory.h"
 #include "third_party/blink/public/web/web_plugin_params.h"
 #include "third_party/blink/public/web/web_testing_support.h"
 #include "ui/gfx/icc_profile.h"

third_party/blink/public/BUILD.gn

@@ -283,7 +283,6 @@ source_set("blink_headers") {
     "web/modules/mediastream/media_stream_video_sink.h",
     "web/modules/mediastream/media_stream_video_source.h",
     "web/modules/mediastream/web_media_stream_device_observer.h",
-    "web/modules/mediastream/web_media_stream_renderer_factory.h",
     "web/modules/mediastream/web_media_stream_utils.h",
     "web/modules/mediastream/webmediaplayer_ms.h",
     "web/modules/service_worker/web_service_worker_context_client.h",

third_party/blink/public/web/modules/mediastream/webmediaplayer_ms.h

@@ -51,7 +51,7 @@ class WebLocalFrame;
 class WebMediaPlayerClient;
 class WebMediaStreamAudioRenderer;
 class WebMediaPlayerMSCompositor;
-class WebMediaStreamRendererFactory;
+class MediaStreamRendererFactory;
 class WebMediaStreamVideoRenderer;
 class WebString;
 class WebVideoFrameSubmitter;
@@ -277,7 +277,7 @@ class BLINK_MODULES_EXPORT WebMediaPlayerMS
   void SetGpuMemoryBufferVideoForTesting(
       media::GpuMemoryBufferVideoFramePool* gpu_memory_buffer_pool);
   void SetMediaStreamRendererFactoryForTesting(
-      std::unique_ptr<WebMediaStreamRendererFactory>);
+      std::unique_ptr<MediaStreamRendererFactory>);
 
   // Callback used to fulfill video.requestVideoFrameCallback() requests.
   void OnNewFramePresentedCallback();
@@ -334,7 +334,7 @@ class BLINK_MODULES_EXPORT WebMediaPlayerMS
 
   std::unique_ptr<media::MediaLog> media_log_;
 
-  std::unique_ptr<WebMediaStreamRendererFactory> renderer_factory_;
+  std::unique_ptr<MediaStreamRendererFactory> renderer_factory_;
 
   const scoped_refptr<base::SingleThreadTaskRunner> main_render_task_runner_;
   const scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;

third_party/blink/renderer/modules/mediastream/BUILD.gn

@@ -45,8 +45,8 @@ blink_modules_sources("mediastream") {
     "media_stream_event.h",
     "media_stream_local_frame_wrapper.cc",
     "media_stream_local_frame_wrapper.h",
-    "media_stream_renderer_factory_impl.cc",
-    "media_stream_renderer_factory_impl.h",
+    "media_stream_renderer_factory.cc",
+    "media_stream_renderer_factory.h",
     "media_stream_track.cc",
     "media_stream_track.h",
     "media_stream_track_content_hint.h",

third_party/blink/renderer/modules/mediastream/media_stream_renderer_factory_impl.cc → third_party/blink/renderer/modules/mediastream/media_stream_renderer_factory.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/renderer/modules/mediastream/media_stream_renderer_factory_impl.h"
+#include "third_party/blink/renderer/modules/mediastream/media_stream_renderer_factory.h"
 
 #include <utility>
 
@@ -47,19 +47,19 @@ void SendLogMessage(const WTF::String& message) {
 
 }  // namespace
 
-MediaStreamRendererFactoryImpl::MediaStreamRendererFactoryImpl() {}
+MediaStreamRendererFactory::MediaStreamRendererFactory() {}
 
-MediaStreamRendererFactoryImpl::~MediaStreamRendererFactoryImpl() {}
+MediaStreamRendererFactory::~MediaStreamRendererFactory() {}
 
 scoped_refptr<WebMediaStreamVideoRenderer>
-MediaStreamRendererFactoryImpl::GetVideoRenderer(
+MediaStreamRendererFactory::GetVideoRenderer(
     const WebMediaStream& web_stream,
     const WebMediaStreamVideoRenderer::RepaintCB& repaint_cb,
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> main_render_task_runner) {
   DCHECK(!web_stream.IsNull());
 
-  DVLOG(1) << "MediaStreamRendererFactoryImpl::GetVideoRenderer stream:"
+  DVLOG(1) << "MediaStreamRendererFactory::GetVideoRenderer stream:"
            << web_stream.Id().Utf8();
 
   MediaStreamDescriptor& descriptor = *web_stream;
@@ -76,7 +76,7 @@ MediaStreamRendererFactoryImpl::GetVideoRenderer(
 }
 
 scoped_refptr<WebMediaStreamAudioRenderer>
-MediaStreamRendererFactoryImpl::GetAudioRenderer(
+MediaStreamRendererFactory::GetAudioRenderer(
     const WebMediaStream& web_stream,
     WebLocalFrame* web_frame,
     const WebString& device_id,

third_party/blink/public/web/modules/mediastream/web_media_stream_renderer_factory.h → third_party/blink/renderer/modules/mediastream/media_stream_renderer_factory.h

@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIASTREAM_WEB_MEDIA_STREAM_RENDERER_FACTORY_H_
-#define THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIASTREAM_WEB_MEDIA_STREAM_RENDERER_FACTORY_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MEDIA_STREAM_RENDERER_FACTORY_H_
+#define THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MEDIA_STREAM_RENDERER_FACTORY_H_
 
-#include "base/memory/ref_counted.h"
+#include "base/macros.h"
+#include "base/memory/scoped_refptr.h"
 #include "third_party/blink/public/platform/modules/mediastream/web_media_stream_audio_renderer.h"
 #include "third_party/blink/public/platform/modules/mediastream/web_media_stream_video_renderer.h"
-#include "third_party/blink/public/platform/web_common.h"
 #include "third_party/blink/public/platform/web_string.h"
+#include "third_party/blink/renderer/modules/modules_export.h"
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -20,29 +21,30 @@ namespace blink {
 class WebMediaStream;
 class WebLocalFrame;
 
-// WebMediaStreamRendererFactory is used by WebMediaPlayerMS to create audio and
-// video feeds from a MediaStream provided an URL.
-// The factory methods are virtual in order for Blink web tests to be able to
-// override them.
-class BLINK_MODULES_EXPORT WebMediaStreamRendererFactory {
+// MediaStreamRendererFactory is used by WebMediaPlayerMS to create audio
+// and video feeds from a MediaStream provided an URL. The factory methods are
+// virtual in order for Blink web tests to be able to override them.
+class MODULES_EXPORT MediaStreamRendererFactory {
  public:
-  virtual ~WebMediaStreamRendererFactory() {}
+  MediaStreamRendererFactory();
+  virtual ~MediaStreamRendererFactory();
 
-  // Returns a WebMediaStreamVideoRenderer that uses the given task runners.
-  // |io_task_runner| is used for passing video frames.
   virtual scoped_refptr<WebMediaStreamVideoRenderer> GetVideoRenderer(
       const WebMediaStream& web_stream,
       const WebMediaStreamVideoRenderer::RepaintCB& repaint_cb,
       scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> main_render_task_runner) = 0;
+      scoped_refptr<base::SingleThreadTaskRunner> main_render_task_runner);
 
   virtual scoped_refptr<WebMediaStreamAudioRenderer> GetAudioRenderer(
       const WebMediaStream& web_stream,
       WebLocalFrame* web_frame,
       const WebString& device_id,
-      base::RepeatingCallback<void()> on_render_error_callback) = 0;
+      base::RepeatingCallback<void()> on_render_error_callback);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MediaStreamRendererFactory);
 };
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIASTREAM_WEB_MEDIA_STREAM_RENDERER_FACTORY_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MEDIA_STREAM_RENDERER_FACTORY_H_

third_party/blink/renderer/modules/mediastream/media_stream_renderer_factory_impl.h

-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MEDIA_STREAM_RENDERER_FACTORY_IMPL_H_
-#define THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MEDIA_STREAM_RENDERER_FACTORY_IMPL_H_
-
-#include "base/macros.h"
-#include "third_party/blink/public/web/modules/mediastream/web_media_stream_renderer_factory.h"
-
-namespace blink {
-
-class MediaStreamRendererFactoryImpl : public WebMediaStreamRendererFactory {
- public:
-  MediaStreamRendererFactoryImpl();
-  ~MediaStreamRendererFactoryImpl() override;
-
-  scoped_refptr<WebMediaStreamVideoRenderer> GetVideoRenderer(
-      const WebMediaStream& web_stream,
-      const WebMediaStreamVideoRenderer::RepaintCB& repaint_cb,
-      scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> main_render_task_runner)
-      override;
-
-  scoped_refptr<WebMediaStreamAudioRenderer> GetAudioRenderer(
-      const WebMediaStream& web_stream,
-      WebLocalFrame* web_frame,
-      const WebString& device_id,
-      base::RepeatingCallback<void()> on_render_error_callback) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MediaStreamRendererFactoryImpl);
-};
-
-}  // namespace blink
-
-#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MEDIA_STREAM_RENDERER_FACTORY_IMPL_H_

third_party/blink/renderer/modules/mediastream/track_audio_renderer.h

@@ -36,7 +36,7 @@ class LocalFrame;
 // PeerConnection/WebRTC-sourced) MediaStreamAudioTracks to an audio output
 // device, reconciling differences in the rates of production and consumption of
 // the audio data.  Note that remote PeerConnection-sourced tracks are NOT
-// rendered by this implementation (see WebMediaStreamRendererFactoryImpl).
+// rendered by this implementation (see MediaStreamRendererFactory).
 //
 // This class uses AudioDeviceFactory to create media::AudioRendererSink and
 // owns/manages their lifecycles.  Output devices are automatically re-created

third_party/blink/renderer/modules/mediastream/webmediaplayer_ms.cc

@@ -35,7 +35,7 @@
 #include "third_party/blink/public/web/modules/media/webmediaplayer_util.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/renderer/modules/mediastream/media_stream_local_frame_wrapper.h"
-#include "third_party/blink/renderer/modules/mediastream/media_stream_renderer_factory_impl.h"
+#include "third_party/blink/renderer/modules/mediastream/media_stream_renderer_factory.h"
 #include "third_party/blink/renderer/modules/mediastream/webmediaplayer_ms_compositor.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_audio_track.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_component.h"
@@ -319,7 +319,7 @@ WebMediaPlayerMS::WebMediaPlayerMS(
       paused_(true),
       video_transformation_(media::kNoTransformation),
       media_log_(std::move(media_log)),
-      renderer_factory_(std::make_unique<MediaStreamRendererFactoryImpl>()),
+      renderer_factory_(std::make_unique<MediaStreamRendererFactory>()),
       main_render_task_runner_(std::move(main_render_task_runner)),
       io_task_runner_(std::move(io_task_runner)),
       compositor_task_runner_(std::move(compositor_task_runner)),
@@ -1319,7 +1319,7 @@ void WebMediaPlayerMS::SetGpuMemoryBufferVideoForTesting(
 }
 
 void WebMediaPlayerMS::SetMediaStreamRendererFactoryForTesting(
-    std::unique_ptr<WebMediaStreamRendererFactory> renderer_factory) {
+    std::unique_ptr<MediaStreamRendererFactory> renderer_factory) {
   renderer_factory_ = std::move(renderer_factory);
 }
 

third_party/blink/renderer/modules/mediastream/webmediaplayer_ms_test.cc

@@ -27,9 +27,9 @@
 #include "third_party/blink/public/platform/web_media_player.h"
 #include "third_party/blink/public/platform/web_media_player_client.h"
 #include "third_party/blink/public/platform/web_media_player_source.h"
-#include "third_party/blink/public/web/modules/mediastream/web_media_stream_renderer_factory.h"
 #include "third_party/blink/public/web/modules/mediastream/webmediaplayer_ms.h"
 #include "third_party/blink/public/web/web_local_frame.h"
+#include "third_party/blink/renderer/modules/mediastream/media_stream_renderer_factory.h"
 #include "third_party/blink/renderer/modules/mediastream/webmediaplayer_ms_compositor.h"
 #include "third_party/blink/renderer/platform/scheduler/public/post_cross_thread_task.h"
 #include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h"
@@ -440,7 +440,7 @@ class MockWebVideoFrameSubmitter : public WebVideoFrameSubmitter {
 
 // The class is used to generate a MockVideoProvider in
 // WebMediaPlayerMS::load().
-class MockRenderFactory : public WebMediaStreamRendererFactory {
+class MockRenderFactory : public MediaStreamRendererFactory {
  public:
   MockRenderFactory(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
@@ -690,7 +690,7 @@ void WebMediaPlayerMSTest::InitializeWebMediaPlayerMS() {
                 WTF::Unretained(this)),
       std::move(submitter_), surface_layer_mode);
   player_->SetMediaStreamRendererFactoryForTesting(
-      std::unique_ptr<WebMediaStreamRendererFactory>(render_factory_));
+      std::unique_ptr<MediaStreamRendererFactory>(render_factory_));
 }
 
 MockMediaStreamVideoRenderer* WebMediaPlayerMSTest::LoadAndGetFrameProvider(