diff options
| author | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 05:25:00 +0000 |
|---|---|---|
| committer | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 05:25:00 +0000 |
| commit | a6e4fbfd6c6848be53e04bcd11b097df8399064d (patch) | |
| tree | 5d2b2b23e3546d06a84aaf05a77492c469a00a6e /ppapi/thunk | |
| parent | 0d2bd8b4c40f047a5c7e8163efd5ca87a9c34094 (diff) | |
| download | chromium_src-a6e4fbfd6c6848be53e04bcd11b097df8399064d.zip chromium_src-a6e4fbfd6c6848be53e04bcd11b097df8399064d.tar.gz chromium_src-a6e4fbfd6c6848be53e04bcd11b097df8399064d.tar.bz2 | |
Change PPB_ContentDecryptor_Private::KeyMessage to pass the message as a PP_Var instead of a PP_Resource.
BUG=164498
TEST=EME decrypt and decode continues to work.
Review URL: https://chromiumcodereview.appspot.com/11442029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk')
| -rw-r--r-- | ppapi/thunk/ppb_content_decryptor_private_thunk.cc | 2 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_instance_api.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc index 905d482..2c0d08a 100644 --- a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc +++ b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc @@ -32,7 +32,7 @@ void KeyAdded(PP_Instance instance, void KeyMessage(PP_Instance instance, PP_Var key_system, PP_Var session_id, - PP_Resource message, + PP_Var message, PP_Var default_url) { EnterInstance enter(instance); if (enter.succeeded()) { diff --git a/ppapi/thunk/ppb_instance_api.h b/ppapi/thunk/ppb_instance_api.h index cb52418..68f7a2b 100644 --- a/ppapi/thunk/ppb_instance_api.h +++ b/ppapi/thunk/ppb_instance_api.h @@ -160,7 +160,7 @@ class PPB_Instance_API { virtual void KeyMessage(PP_Instance instance, PP_Var key_system, PP_Var session_id, - PP_Resource message, + PP_Var message, PP_Var default_url) = 0; virtual void KeyError(PP_Instance instance, PP_Var key_system, |