Changes to support CDM_7

ppapi/proxy/ppapi_param_traits.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/proxy/ppapi_param_traits.h"
 
 #include <string.h>  // For memcpy
 
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
@@ skipping 79 matching lines @@
   if (!ParamTraits<bool>::Read(m, iter, &result))
     return false;
   *r = PP_FromBool(result);
   return true;
 }
 
 // static
 void ParamTraits<PP_Bool>::Log(const param_type& p, std::string* l) {
 }
 
+// PP_KeyInformation -------------------------------------------------------
+
+// static
+void ParamTraits<PP_KeyInformation>::Write(Message* m, const param_type& p) {
+  WriteParam(m, p.key_id_size);
+  m->WriteBytes(p.key_id, static_cast<int>(p.key_id_size));
+  WriteParam(m, p.key_status);
+  WriteParam(m, p.system_code);

[dmichael (off chromium), 2015/01/08 18:23:18]

Did you try using the IPC_STRUCT_TRAITS_BEGIN/END stuff like this?
https://code.google.com/p/chromium/codesearch#chromium/src/ppapi/proxy/ppapi_...
I'm not certain it works with a fixed array like key_id, but *if* it does, it
would be simpler. (I'm guessing you tried that and it didn't work, though, in
which case ParamTraits is appropriate).

[jrummell, 2015/01/08 18:40:50]

I did try it, but got compile errors with ParamTraits<uint8_t[512]>. Tried
char[512] too, in case it was supported, but it failed too. 

+}
+
+// static
+bool ParamTraits<PP_KeyInformation>::Read(const Message* m,
+                                          PickleIterator* iter,
+                                          param_type* p) {
+  uint32 size;

[dcheng, 2015/01/08 19:12:31]

uint32_t

[jrummell, 2015/01/08 20:12:12]

Done.

+  if (!ReadParam(m, iter, &size))
+    return false;
+  if (size > sizeof(p->key_id))
+    return false;
+  p->key_id_size = size;
+
+  const char* data;
+  if (!iter->ReadBytes(&data, size))
+    return false;
+  memcpy(p->key_id, data, size);
+
+  PP_CdmKeyStatus key_status;
+  if (!ReadParam(m, iter, &key_status))
+    return false;
+  p->key_status = key_status;
+
+  uint32 system_code;

[dcheng, 2015/01/08 19:12:31]

Here too.

[jrummell, 2015/01/08 20:12:12]

Done.

+  if (!ReadParam(m, iter, &system_code))
+    return false;
+  p->system_code = system_code;
+
+  return true;
+}
+
+// static
+void ParamTraits<PP_KeyInformation>::Log(const param_type& p, std::string* l) {
+  l->append("<PP_KeyInformation (");
+  LogParam(p.key_id_size, l);
+  l->append(" bytes)>");
+}
+
 // PP_NetAddress_Private -------------------------------------------------------
 
 // static
 void ParamTraits<PP_NetAddress_Private>::Write(Message* m,
                                                const param_type& p) {
   WriteParam(m, p.size);
   m->WriteBytes(p.data, static_cast<int>(p.size));
 }
 
 // static
@@ skipping 544 matching lines @@
   }
   return true;
 }
 
 void ParamTraits<ppapi::CompositorLayerData::Transform>::Log(
     const param_type& p,
     std::string* l) {
 }
 
 }  // namespace IPC