diff options
author | jrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-22 05:15:26 +0000 |
---|---|---|
committer | jrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-22 05:15:26 +0000 |
commit | 82ce5b9c429f3808c6972d5e19b71b516baee7ec (patch) | |
tree | 2dd04975a2c8c10e4c8b2e958e20aca714e983a3 /content/renderer/media/webcontentdecryptionmodule_impl.h | |
parent | 549a66179f6324211b07c7b83c5dbd879608532f (diff) | |
download | chromium_src-82ce5b9c429f3808c6972d5e19b71b516baee7ec.zip chromium_src-82ce5b9c429f3808c6972d5e19b71b516baee7ec.tar.gz chromium_src-82ce5b9c429f3808c6972d5e19b71b516baee7ec.tar.bz2 |
Moving creation of WebContentDecryptionModule from Platform to public/web.
This is done in order to get the origin and WebFrame needed to create the
CDM. This is now similar to how WebMediaPlayer is created. This prepares
for the Blink changes by making the Chromium side changes necessary.
BUG=250049
TEST=EME content tests pass
Review URL: https://codereview.chromium.org/195303003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/webcontentdecryptionmodule_impl.h')
-rw-r--r-- | content/renderer/media/webcontentdecryptionmodule_impl.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.h b/content/renderer/media/webcontentdecryptionmodule_impl.h index 6ec3a95..d799664 100644 --- a/content/renderer/media/webcontentdecryptionmodule_impl.h +++ b/content/renderer/media/webcontentdecryptionmodule_impl.h @@ -12,6 +12,11 @@ #include "base/strings/string16.h" #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h" +namespace blink { +class WebFrame; +class WebSecurityOrigin; +} + namespace media { class Decryptor; class MediaKeys; @@ -25,7 +30,13 @@ class WebContentDecryptionModuleSessionImpl; class WebContentDecryptionModuleImpl : public blink::WebContentDecryptionModule { public: + // TODO(jrummell): Remove this method once all callers have updated to pass + // |frame| and |securityOrigin|. + static WebContentDecryptionModuleImpl* Create( + const base::string16& key_system); static WebContentDecryptionModuleImpl* Create( + blink::WebFrame* frame, + const blink::WebSecurityOrigin& security_origin, const base::string16& key_system); virtual ~WebContentDecryptionModuleImpl(); |