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

Unified Diff: media/mojo/services/interface_factory_impl.h

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. 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/gpu/video_encode_accelerator_unittest.cc ('k') | media/mojo/services/interface_factory_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/interface_factory_impl.h
diff --git a/media/mojo/services/interface_factory_impl.h b/media/mojo/services/interface_factory_impl.h
index 19be2185c8404923ae0dd12b90b38a067dd72945..9c0cbb94ea7bdb22c9370a4d7eec4e337eb80012 100644
--- a/media/mojo/services/interface_factory_impl.h
+++ b/media/mojo/services/interface_factory_impl.h
@@ -25,7 +25,7 @@ class InterfaceFactoryImpl : public mojom::InterfaceFactory {
public:
InterfaceFactoryImpl(
service_manager::mojom::InterfaceProviderPtr interfaces,
- scoped_refptr<MediaLog> media_log,
+ MediaLog* media_log,
std::unique_ptr<service_manager::ServiceContextRef> connection_ref,
MojoMediaClient* mojo_media_client);
~InterfaceFactoryImpl() final;
@@ -57,6 +57,7 @@ class InterfaceFactoryImpl : public mojom::InterfaceFactory {
#endif // defined(ENABLE_MOJO_VIDEO_DECODER)
#if defined(ENABLE_MOJO_RENDERER)
+ MediaLog* media_log_;
std::unique_ptr<RendererFactory> renderer_factory_;
mojo::StrongBindingSet<mojom::Renderer> renderer_bindings_;
#endif // defined(ENABLE_MOJO_RENDERER)
@@ -67,7 +68,6 @@ class InterfaceFactoryImpl : public mojom::InterfaceFactory {
mojo::StrongBindingSet<mojom::ContentDecryptionModule> cdm_bindings_;
#endif // defined(ENABLE_MOJO_CDM)
- scoped_refptr<MediaLog> media_log_;
std::unique_ptr<service_manager::ServiceContextRef> connection_ref_;
MojoMediaClient* mojo_media_client_;
« no previous file with comments | « media/gpu/video_encode_accelerator_unittest.cc ('k') | media/mojo/services/interface_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698