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

Unified Diff: media/blink/webcontentdecryptionmoduleaccess_impl.h

Issue 872453002: Store the accumulated configuration from requestMediaKeySystemAccess(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove 'override' entirely. Created 5 years, 11 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/blink/webcontentdecryptionmoduleaccess_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webcontentdecryptionmoduleaccess_impl.h
diff --git a/media/blink/webcontentdecryptionmoduleaccess_impl.h b/media/blink/webcontentdecryptionmoduleaccess_impl.h
index 2d288ca5bace192f23016cfceb22cff2c30c6f54..9d54823775104a1fa391625080af68d182d513bb 100644
--- a/media/blink/webcontentdecryptionmoduleaccess_impl.h
+++ b/media/blink/webcontentdecryptionmoduleaccess_impl.h
@@ -9,6 +9,7 @@
#include "base/memory/scoped_ptr.h"
#include "media/base/cdm_factory.h"
#include "third_party/WebKit/public/platform/WebContentDecryptionModuleAccess.h"
+#include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/web/WebSecurityOrigin.h"
@@ -23,23 +24,27 @@ class WebContentDecryptionModuleAccessImpl
public:
static WebContentDecryptionModuleAccessImpl* Create(
const blink::WebString& key_system,
+ const blink::WebMediaKeySystemConfiguration& configuration,
const blink::WebSecurityOrigin& security_origin,
CdmFactory* cdm_factory);
virtual ~WebContentDecryptionModuleAccessImpl();
// blink::WebContentDecryptionModuleAccess interface.
+ virtual blink::WebMediaKeySystemConfiguration getConfiguration();
virtual void createContentDecryptionModule(
- blink::WebContentDecryptionModuleResult result) override;
+ blink::WebContentDecryptionModuleResult result);
private:
WebContentDecryptionModuleAccessImpl(
const blink::WebString& key_system,
+ const blink::WebMediaKeySystemConfiguration& configuration,
const blink::WebSecurityOrigin& security_origin,
CdmFactory* cdm_factory);
DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleAccessImpl);
blink::WebString key_system_;
+ blink::WebMediaKeySystemConfiguration configuration_;
blink::WebSecurityOrigin security_origin_;
CdmFactory* cdm_factory_;
};
« no previous file with comments | « no previous file | media/blink/webcontentdecryptionmoduleaccess_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698