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

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 2711153006: Add RendererFactorySelector (Closed)
Patch Set: Removed flat_map. Temp fix of -Wsometimes-initialized 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 | « media/blink/webmediaplayer_impl.h ('k') | media/blink/webmediaplayer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index f2ba41b4781f8ebe650e0c5cedd43ea28924c943..b81e1516cc35c783f35e81cf62f359024bb992f7 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -175,7 +175,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
blink::WebMediaPlayerClient* client,
blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
WebMediaPlayerDelegate* delegate,
- std::unique_ptr<RendererFactory> renderer_factory,
+ std::unique_ptr<RendererFactorySelector> renderer_factory_selector,
linked_ptr<UrlIndex> url_index,
std::unique_ptr<WebMediaPlayerParams> params)
: frame_(frame),
@@ -230,7 +230,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
#endif
volume_(1.0),
volume_multiplier_(1.0),
- renderer_factory_(std::move(renderer_factory)),
+ renderer_factory_selector_(std::move(renderer_factory_selector)),
surface_manager_(params->surface_manager()),
overlay_surface_id_(SurfaceManager::kNoSurfaceID),
suppress_destruction_errors_(false),
@@ -249,7 +249,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
params->embedded_media_experience_enabled()) {
DVLOG(1) << __func__;
DCHECK(!adjust_allocated_memory_cb_.is_null());
- DCHECK(renderer_factory_);
+ DCHECK(renderer_factory_selector_);
DCHECK(client_);
DCHECK(delegate_);
@@ -1725,7 +1725,7 @@ std::unique_ptr<Renderer> WebMediaPlayerImpl::CreateRenderer() {
request_surface_cb = BindToCurrentLoop(
base::Bind(&WebMediaPlayerImpl::OnSurfaceRequested, AsWeakPtr()));
#endif
- return renderer_factory_->CreateRenderer(
+ return renderer_factory_selector_->GetCurrentFactory()->CreateRenderer(
media_task_runner_, worker_task_runner_, audio_source_provider_.get(),
compositor_, request_surface_cb);
}
« no previous file with comments | « media/blink/webmediaplayer_impl.h ('k') | media/blink/webmediaplayer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698