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 /webkit/media/crypto | |
| 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 'webkit/media/crypto')
| -rw-r--r-- | webkit/media/crypto/ppapi/cdm_wrapper.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/webkit/media/crypto/ppapi/cdm_wrapper.cc b/webkit/media/crypto/ppapi/cdm_wrapper.cc index 9c2afa2..9ebba03 100644 --- a/webkit/media/crypto/ppapi/cdm_wrapper.cc +++ b/webkit/media/crypto/ppapi/cdm_wrapper.cc @@ -877,16 +877,13 @@ void CdmWrapper::KeyMessage(int32_t result, const std::string& default_url) { PP_DCHECK(result == PP_OK); - pp::Buffer_Dev message_buffer; - - if (!message.empty()) { - message_buffer = pp::Buffer_Dev(this, message.size()); - PP_DCHECK(message_buffer.size() == message.size()); - memcpy(message_buffer.data(), message.data(), message.size()); + pp::VarArrayBuffer message_array_buffer(message.size()); + if (message.size() > 0) { + memcpy(message_array_buffer.Map(), message.data(), message.size()); } pp::ContentDecryptor_Private::KeyMessage( - key_system_, session_id, message_buffer, default_url); + key_system_, session_id, message_array_buffer, default_url); } // TODO(xhwang): Support MediaKeyError (see spec: http://goo.gl/rbdnR) in CDM |