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

Unified Diff: media/blink/webcontentdecryptionmoduleaccess_impl.h

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
Index: media/blink/webcontentdecryptionmoduleaccess_impl.h
diff --git a/media/blink/webcontentdecryptionmoduleaccess_impl.h b/media/blink/webcontentdecryptionmoduleaccess_impl.h
index a70fca215bb3daa94647a50270311ae21f2d5002..212570c105a9ed86a8793e59321c9dfc8634ac71 100644
--- a/media/blink/webcontentdecryptionmoduleaccess_impl.h
+++ b/media/blink/webcontentdecryptionmoduleaccess_impl.h
@@ -6,6 +6,7 @@
#define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULEACCESS_IMPL_H_
#include "base/memory/weak_ptr.h"
+#include "media/base/cdm_config.h"
#include "third_party/WebKit/public/platform/WebContentDecryptionModuleAccess.h"
#include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
#include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h"
@@ -21,8 +22,9 @@ class WebContentDecryptionModuleAccessImpl
public:
static WebContentDecryptionModuleAccessImpl* Create(
const blink::WebString& key_system,
- const blink::WebMediaKeySystemConfiguration& configuration,
const blink::WebSecurityOrigin& security_origin,
+ const blink::WebMediaKeySystemConfiguration& configuration,
+ const CdmConfig& cdm_config,
const base::WeakPtr<WebEncryptedMediaClientImpl>& client);
virtual ~WebContentDecryptionModuleAccessImpl();
@@ -34,13 +36,15 @@ class WebContentDecryptionModuleAccessImpl
private:
WebContentDecryptionModuleAccessImpl(
const blink::WebString& key_system,
- const blink::WebMediaKeySystemConfiguration& configuration,
const blink::WebSecurityOrigin& security_origin,
+ const blink::WebMediaKeySystemConfiguration& configuration,
+ const CdmConfig& cdm_config,
const base::WeakPtr<WebEncryptedMediaClientImpl>& client);
blink::WebString key_system_;
ddorwin 2015/05/13 06:03:21 nit: I prefer members to be const when possible to
sandersd (OOO until July 31) 2015/05/14 00:06:57 Done.
- blink::WebMediaKeySystemConfiguration configuration_;
blink::WebSecurityOrigin security_origin_;
+ blink::WebMediaKeySystemConfiguration configuration_;
+ CdmConfig cdm_config_;
ddorwin 2015/05/13 06:03:21 configuration and config. Hmmm. They match the typ
sandersd (OOO until July 31) 2015/05/14 00:06:57 Acknowledged.
// Keep a WeakPtr as client is owned by render_frame_impl.
base::WeakPtr<WebEncryptedMediaClientImpl> client_;

Powered by Google App Engine
This is Rietveld 408576698