Return void from all PPP CDM API interface methods

ppapi/cpp/private/content_decryptor_private.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/cpp/private/content_decryptor_private.h"
 
 #include <cstring>  // memcpy
 
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/private/ppb_content_decryptor_private.h"
 #include "ppapi/c/private/ppp_content_decryptor_private.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/logging.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 #include "ppapi/cpp/var.h"
 
 namespace pp {
 
 namespace {
 
 static const char kPPPContentDecryptorInterface[] =
     PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE;
 
-PP_Bool GenerateKeyRequest(PP_Instance instance,
-                           PP_Var key_system_arg,
-                           PP_Var init_data_arg) {
+void GenerateKeyRequest(PP_Instance instance,
+                        PP_Var key_system_arg,
+                        PP_Var init_data_arg) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
-    return PP_FALSE;
+    return;

[xhwang, 2012/09/13 12:24:59]

For here and below, if this happens, is it a coding error or runtime error? If
former, change to DCHECK or add NOTREACHED? 

[Tom Finegan, 2012/09/14 00:08:37]

Yeah... I was being a little bit over conservative about changes in this CL.
Getting rid of the if in favor of a PP_DCHECK() seems better.

 
   pp::Var key_system_var(pp::PASS_REF, key_system_arg);
   if (key_system_var.is_string() == false)
-    return PP_FALSE;
+    return;
 
   pp::Var init_data_var(pp::PASS_REF, init_data_arg);
   if (init_data_var.is_array_buffer() == false)
-    return PP_FALSE;
+    return;
   pp::VarArrayBuffer init_data_array_buffer(init_data_var);
 
-  return PP_FromBool(
-      static_cast<ContentDecryptor_Private*>(object)->GenerateKeyRequest(
-          key_system_var.AsString(),
-          init_data_array_buffer));
+  static_cast<ContentDecryptor_Private*>(object)->GenerateKeyRequest(
+      key_system_var.AsString(),
+      init_data_array_buffer);
 }
 
-PP_Bool AddKey(PP_Instance instance,
-               PP_Var session_id_arg,
-               PP_Var key_arg,
-               PP_Var init_data_arg) {
+void AddKey(PP_Instance instance,
+            PP_Var session_id_arg,
+            PP_Var key_arg,
+            PP_Var init_data_arg) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
-    return PP_FALSE;
+    return;
 
   pp::Var session_id_var(pp::PASS_REF, session_id_arg);
   if (session_id_var.is_string() == false)
-    return PP_FALSE;
+    return;
 
   pp::Var key_var(pp::PASS_REF, key_arg);
   if (key_var.is_array_buffer() == false)
-    return PP_FALSE;
+    return;
   pp::VarArrayBuffer key(key_var);
 
   pp::Var init_data_var(pp::PASS_REF, init_data_arg);
   if (init_data_var.is_array_buffer() == false)
-    return PP_FALSE;
+    return;
   pp::VarArrayBuffer init_data(init_data_var);
 
-  return PP_FromBool(
-      static_cast<ContentDecryptor_Private*>(object)->AddKey(
-          session_id_var.AsString(),
-          key,
-          init_data));
+
+  static_cast<ContentDecryptor_Private*>(object)->AddKey(
+      session_id_var.AsString(),
+      key,
+      init_data);
 }
 
-PP_Bool CancelKeyRequest(PP_Instance instance,
-                         PP_Var session_id_arg) {
+void CancelKeyRequest(PP_Instance instance, PP_Var session_id_arg) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
-    return PP_FALSE;
+    return;
 
   pp::Var session_id_var(pp::PASS_REF, session_id_arg);
   if (session_id_var.is_string() == false)
-    return PP_FALSE;
+    return;
 
-  return PP_FromBool(
-      static_cast<ContentDecryptor_Private*>(object)->
-          CancelKeyRequest(session_id_var.AsString()));
+  static_cast<ContentDecryptor_Private*>(object)->CancelKeyRequest(
+      session_id_var.AsString());
 }
 
 
-PP_Bool Decrypt(PP_Instance instance,
-                PP_Resource encrypted_resource,
-                const PP_EncryptedBlockInfo* encrypted_block_info) {
+void Decrypt(PP_Instance instance,
+             PP_Resource encrypted_resource,
+             const PP_EncryptedBlockInfo* encrypted_block_info) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
-    return PP_FALSE;
+    return;
 
   pp::Buffer_Dev encrypted_block(pp::PassRef(), encrypted_resource);
 
-  return PP_FromBool(
-      static_cast<ContentDecryptor_Private*>(object)->Decrypt(
-          encrypted_block,
-          *encrypted_block_info));
+  static_cast<ContentDecryptor_Private*>(object)->Decrypt(
+      encrypted_block,
+      *encrypted_block_info);
 }
 
-PP_Bool DecryptAndDecode(PP_Instance instance,
-                         PP_Resource encrypted_resource,
-                         const PP_EncryptedBlockInfo* encrypted_block_info) {
+void DecryptAndDecode(PP_Instance instance,
+                      PP_Resource encrypted_resource,
+                      const PP_EncryptedBlockInfo* encrypted_block_info) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
-    return PP_FALSE;
+    return;
 
   pp::Buffer_Dev encrypted_block(pp::PassRef(), encrypted_resource);
 
-  return PP_FromBool(
-      static_cast<ContentDecryptor_Private*>(object)->DecryptAndDecode(
-          encrypted_block,
-          *encrypted_block_info));
+  static_cast<ContentDecryptor_Private*>(object)->DecryptAndDecode(
+      encrypted_block,
+      *encrypted_block_info);
 }
 
 const PPP_ContentDecryptor_Private ppp_content_decryptor = {
   &GenerateKeyRequest,
   &AddKey,
   &CancelKeyRequest,
   &Decrypt,
   &DecryptAndDecode
 };
 
@@ skipping 104 matching lines @@
     const PP_DecryptedBlockInfo& decrypted_block_info) {
   if (has_interface<PPB_ContentDecryptor_Private>()) {
     get_interface<PPB_ContentDecryptor_Private>()->DeliverSamples(
         associated_instance_.pp_instance(),
         decrypted_samples.pp_resource(),
         &decrypted_block_info);
   }
 }
 
 }  // namespace pp