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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2826883002: Rename AdaptiveRendererFactory (Closed)
Patch Set: Minor fixes Created 3 years, 8 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 | « no previous file | media/base/renderer_factory_selector.h » ('j') | media/base/renderer_factory_selector.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index d11d877a87eddde856148f891e6d0f5b1b3dd416..f5d67023caf01263f63d706928943764654e096a 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -285,7 +285,7 @@
#endif
#if BUILDFLAG(ENABLE_MEDIA_REMOTING)
-#include "media/remoting/adaptive_renderer_factory.h" // nogncheck
+#include "media/remoting/courier_renderer_factory.h" // nogncheck
#include "media/remoting/remoting_cdm_controller.h" // nogncheck
#include "media/remoting/remoting_cdm_factory.h" // nogncheck
#include "media/remoting/renderer_controller.h" // nogncheck
@@ -2958,11 +2958,19 @@ blink::WebMediaPlayer* RenderFrameImpl::CreateMediaPlayer(
#endif // defined(ENABLE_MOJO_RENDERER)
#if BUILDFLAG(ENABLE_MEDIA_REMOTING)
- media_renderer_factory =
- base::MakeUnique<media::remoting::AdaptiveRendererFactory>(
- std::move(media_renderer_factory), std::move(remoting_controller));
+ auto courier_factory =
+ base::MakeUnique<media::remoting::CourierRendererFactory>(
+ std::move(remoting_controller));
- factory_type = media::RendererFactorySelector::FactoryType::ADAPTIVE;
+ // base::Unretained is safe here because |factory_selector| owns
+ // |courier_factory|.
+ factory_selector->SetUseCourierCB(base::Bind(
+ &media::remoting::CourierRendererFactory::ShouldCreateCourierRenderer,
+ base::Unretained(courier_factory.get())));
+
+ factory_selector->AddFactory(
+ media::RendererFactorySelector::FactoryType::COURIER,
+ std::move(courier_factory));
#endif
if (!url_index_.get() || url_index_->frame() != frame_)
« no previous file with comments | « no previous file | media/base/renderer_factory_selector.h » ('j') | media/base/renderer_factory_selector.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698