| 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_;
|
| };
|
|
|