diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 06:11:09 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 06:11:09 +0000 |
| commit | 1561fa831a20df80b9ae5aaecf7e07e184176387 (patch) | |
| tree | d01cdb23b1916e43565274383a0483f75940f060 /content/renderer/pepper | |
| parent | 4c34dee16bef0f9c15cad7e794dafde0db27ba5e (diff) | |
| download | chromium_src-1561fa831a20df80b9ae5aaecf7e07e184176387.zip chromium_src-1561fa831a20df80b9ae5aaecf7e07e184176387.tar.gz chromium_src-1561fa831a20df80b9ae5aaecf7e07e184176387.tar.bz2 | |
Encrypted Media: Use uint32 for systemCode in SessionError.
In prefixed EME spec, "systemCode" is an unsigned short (16bit unsigned integer). In unprefixed EME spec, it's an unsigned long (32bit unsigned integer). This CL updates "system_code" parameters in SessionError to use uint32.
TBR=dcheng@chromium.org
BUG=224786
Review URL: https://codereview.chromium.org/179123009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/pepper')
4 files changed, 4 insertions, 4 deletions
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc index f9747a0..53ff21b 100644 --- a/content/renderer/pepper/content_decryptor_delegate.cc +++ b/content/renderer/pepper/content_decryptor_delegate.cc @@ -627,7 +627,7 @@ void ContentDecryptorDelegate::OnSessionClosed(uint32 session_id) { void ContentDecryptorDelegate::OnSessionError(uint32 session_id, int32_t media_error, - int32_t system_code) { + uint32_t system_code) { if (session_error_cb_.is_null()) return; diff --git a/content/renderer/pepper/content_decryptor_delegate.h b/content/renderer/pepper/content_decryptor_delegate.h index f643d41..c45351e 100644 --- a/content/renderer/pepper/content_decryptor_delegate.h +++ b/content/renderer/pepper/content_decryptor_delegate.h @@ -92,7 +92,7 @@ class ContentDecryptorDelegate { void OnSessionClosed(uint32 session_id); void OnSessionError(uint32 session_id, int32_t media_error, - int32_t system_code); + uint32_t system_code); void DeliverBlock(PP_Resource decrypted_block, const PP_DecryptedBlockInfo* block_info); void DecoderInitializeDone(PP_DecryptorStreamType decoder_type, diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc index eca0c13..72d9d2a 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc @@ -2367,7 +2367,7 @@ void PepperPluginInstanceImpl::SessionClosed(PP_Instance instance, void PepperPluginInstanceImpl::SessionError(PP_Instance instance, uint32_t session_id, int32_t media_error, - int32_t system_code) { + uint32_t system_code) { content_decryptor_delegate_->OnSessionError( session_id, media_error, system_code); } diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h index 5296262..c113139 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.h +++ b/content/renderer/pepper/pepper_plugin_instance_impl.h @@ -464,7 +464,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl virtual void SessionError(PP_Instance instance, uint32_t session_id, int32_t media_error, - int32_t system_code) OVERRIDE; + uint32_t system_code) OVERRIDE; virtual void DeliverBlock(PP_Instance instance, PP_Resource decrypted_block, const PP_DecryptedBlockInfo* block_info) OVERRIDE; |