summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 06:11:09 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 06:11:09 +0000
commit1561fa831a20df80b9ae5aaecf7e07e184176387 (patch)
treed01cdb23b1916e43565274383a0483f75940f060 /ppapi/proxy
parent4c34dee16bef0f9c15cad7e794dafde0db27ba5e (diff)
downloadchromium_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 'ppapi/proxy')
-rw-r--r--ppapi/proxy/ppb_instance_proxy.cc6
-rw-r--r--ppapi/proxy/ppb_instance_proxy.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index f3f6322..885b5e4 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -573,7 +573,7 @@ void PPB_Instance_Proxy::SessionClosed(PP_Instance instance,
void PPB_Instance_Proxy::SessionError(PP_Instance instance,
uint32_t session_id,
int32_t media_error,
- int32_t system_code) {
+ uint32_t system_code) {
dispatcher()->Send(new PpapiHostMsg_PPBInstance_SessionError(
API_ID_PPB_INSTANCE, instance, session_id, media_error, system_code));
}
@@ -1094,13 +1094,13 @@ void PPB_Instance_Proxy::OnHostMsgSessionClosed(PP_Instance instance,
void PPB_Instance_Proxy::OnHostMsgSessionError(PP_Instance instance,
uint32_t session_id,
int32_t media_error,
- int32_t system_error) {
+ uint32_t system_code) {
if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE))
return;
EnterInstanceNoLock enter(instance);
if (enter.succeeded()) {
enter.functions()->SessionError(
- instance, session_id, media_error, system_error);
+ instance, session_id, media_error, system_code);
}
}
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h
index 0737b58..c8aa49d 100644
--- a/ppapi/proxy/ppb_instance_proxy.h
+++ b/ppapi/proxy/ppb_instance_proxy.h
@@ -128,7 +128,7 @@ class PPB_Instance_Proxy : public InterfaceProxy,
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;
@@ -234,7 +234,7 @@ class PPB_Instance_Proxy : public InterfaceProxy,
virtual void OnHostMsgSessionError(PP_Instance instance,
uint32_t session_id,
int32_t media_error,
- int32_t system_code);
+ uint32_t system_code);
virtual void OnHostMsgDecoderInitializeDone(
PP_Instance instance,
PP_DecryptorStreamType decoder_type,