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

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

Issue 1230313010: media: Add ServiceFactory mojo interface and implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 5 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/mojo/services/mojo_renderer_factory.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_renderer_service.h
diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h
index b0f0dfae7bb948c68b06ae857e03ebff12bd7f38..9311fe1b213277350c73b659d0239d2dbc9949a9 100644
--- a/media/mojo/services/mojo_renderer_service.h
+++ b/media/mojo/services/mojo_renderer_service.h
@@ -16,6 +16,7 @@
#include "media/base/media_export.h"
#include "media/base/pipeline_status.h"
#include "media/mojo/interfaces/media_renderer.mojom.h"
+#include "media/mojo/services/mojo_cdm_service_context.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
namespace mojo {
@@ -40,7 +41,7 @@ class MEDIA_EXPORT MojoRendererService
// |cdm_context_provider| can be used to find the CdmContext to support
// encrypted media. If null, encrypted media is not supported.
MojoRendererService(
- CdmContextProvider* cdm_context_provider,
+ base::WeakPtr<CdmContextProvider> cdm_context_provider,
RendererFactory* renderer_factory,
const scoped_refptr<MediaLog>& media_log,
mojo::InterfaceRequest<interfaces::MediaRenderer> request);
@@ -102,7 +103,7 @@ class MEDIA_EXPORT MojoRendererService
mojo::StrongBinding<interfaces::MediaRenderer> binding_;
- CdmContextProvider* cdm_context_provider_;
+ base::WeakPtr<CdmContextProvider> cdm_context_provider_;
State state_;
« no previous file with comments | « media/mojo/services/mojo_renderer_factory.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698