Modify the PPAPI CDM interface to pass more info.

ppapi/proxy/content_decryptor_private_serializer-inl.h

+// 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.
+
+#ifndef PPAPI_PROXY_CONTENT_DECRYPTOR_PRIVATE_SERIALIZER_INL_H_

[dmichael (off chromium), 2012/08/21 17:37:08]

I wouldn't use the -inl suffix

[Tom Finegan, 2012/08/21 22:57:39]

Done.

+#define PPAPI_PROXY_CONTENT_DECRYPTOR_PRIVATE_SERIALIZER_INL_H_
+
+#include <cstring>
+#include <string>
+
+#include "ppapi/c/private/pp_content_decryptor.h"
+
+namespace ppapi {
+namespace proxy {
+
+// Serialization/deserialization utility functions for storing/extracting
+// PP_{De|En}cryptedBlockInfo structs within std::string's for passing through
+// IPC. Both functions return true upon success, and false upon failure.
+//
+// Note, these functions check the size of |block_info| against the size of
+// the "serialized" data stored within |serialized_block_info|, and will report
+// failure if expectations are not met. Use of CHECK/DCHECK has been avoided
+// because the functions are intended for use on both sides of the IPC proxy.
+
+template <typename T>
+bool SerializeBlockInfo(const T& block_info,
+                        std::string* serialized_block_info) {
+  if (!serialized_block_info)
+    return false;
+
+  serialized_block_info->assign(reinterpret_cast<const char*>(&block_info),
+                                sizeof(T));

[dmichael (off chromium), 2012/08/21 17:37:08]

nit: You should prefer to use sizeof on a variable name instead of a type name,
i.e. sizeof(block_info)
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#sizeof

[Tom Finegan, 2012/08/21 22:57:39]

Doh! Missed this one when I fixed the other for xhwang. Done.

+
+  if (serialized_block_info->size() != sizeof(block_info))
+    return false;
+
+  return true;
+}
+
+template <typename T>
+bool DeserializeBlockInfo(const std::string& serialized_block_info,
+                          T* block_info) {
+  if (!block_info)
+    return false;
+
+  if (serialized_block_info.size() != sizeof(T))

[dmichael (off chromium), 2012/08/21 17:37:08]

sizeof(*block_info)

[Tom Finegan, 2012/08/21 22:57:39]

Done.

+    return false;
+
+  std::memcpy(block_info, serialized_block_info.data(), sizeof(T));

[dmichael (off chromium), 2012/08/21 17:37:08]

sizeof(*block_info)

[Tom Finegan, 2012/08/21 22:57:39]

Done.

+  return true;
+}
+
+}  // namespace proxy
+}  // namespace ppapi
+
+#endif  // PPAPI_PROXY_CONTENT_DECRYPTOR_PRIVATE_SERIALIZER_INL_H_