diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 23:21:53 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 23:21:53 +0000 |
| commit | 4b556cfa4c747c6aa5e35fbe04669b974a013531 (patch) | |
| tree | 0fd30c0106cf89f6ba2803838ef87029339c7b2e /content/renderer/media/webcontentdecryptionmodule_impl.h | |
| parent | ff1a10b45ad9190a9545768411f1a884273ef27d (diff) | |
| download | chromium_src-4b556cfa4c747c6aa5e35fbe04669b974a013531.zip chromium_src-4b556cfa4c747c6aa5e35fbe04669b974a013531.tar.gz chromium_src-4b556cfa4c747c6aa5e35fbe04669b974a013531.tar.bz2 | |
Introduce the ENABLE_BROWSER_CDMS macro.
This will be defined when a platform needs to use browser side CDM to implement
EME API. Currently this is only used on Android.
Note that MediaWebContentsObserver is shared by Android media player managers
and browser CDM managers. Since ENABLE_BROWSER_CDMS is always true on Android,
we only check ENABLE_BROWSER_CDMS to decide whether MediaWebContentsObserver
should be used. Also, in media_web_contents_observer.*, we only check
OS_ANDROID to decide whether Android media player code should be used. This is
not perfect but makes the current code simple. This will be fixed when we have
a general (not Android specic) media player manager.
TBR=yfriedman@chromium.org
BUG=315312
TEST=Compiles on Android. Test pages still work on Android. Compiles when I choose to use browser CDM on Linux.
Review URL: https://codereview.chromium.org/318753010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/webcontentdecryptionmodule_impl.h')
| -rw-r--r-- | content/renderer/media/webcontentdecryptionmodule_impl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.h b/content/renderer/media/webcontentdecryptionmodule_impl.h index 152f962..871ca27 100644 --- a/content/renderer/media/webcontentdecryptionmodule_impl.h +++ b/content/renderer/media/webcontentdecryptionmodule_impl.h @@ -27,7 +27,7 @@ class MediaKeys; namespace content { class CdmSessionAdapter; -#if defined(OS_ANDROID) +#if defined(ENABLE_BROWSER_CDMS) class RendererCdmManager; #endif class WebContentDecryptionModuleSessionImpl; @@ -38,7 +38,7 @@ class WebContentDecryptionModuleImpl static WebContentDecryptionModuleImpl* Create( #if defined(ENABLE_PEPPER_CDMS) blink::WebLocalFrame* frame, -#elif defined(OS_ANDROID) +#elif defined(ENABLE_BROWSER_CDMS) RendererCdmManager* manager, #endif const blink::WebSecurityOrigin& security_origin, @@ -52,11 +52,11 @@ class WebContentDecryptionModuleImpl // after WebContentDecryptionModule is freed. http://crbug.com/330324 media::Decryptor* GetDecryptor(); -#if defined(OS_ANDROID) +#if defined(ENABLE_BROWSER_CDMS) // Returns the CDM ID associated with this object. May be kInvalidCdmId if no // CDM ID is associated, such as when Clear Key is used. int GetCdmId() const; -#endif // defined(OS_ANDROID) +#endif // defined(ENABLE_BROWSER_CDMS) // blink::WebContentDecryptionModule implementation. virtual blink::WebContentDecryptionModuleSession* createSession( |