Add type argument to pepper content decryptor method GenerateKeyRequest().

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;
 
 void GenerateKeyRequest(PP_Instance instance,
                         PP_Var key_system_arg,
+                        PP_Var mime_type_arg,
                         PP_Var init_data_arg) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
     return;
 
   pp::Var key_system_var(pp::PASS_REF, key_system_arg);
   if (key_system_var.is_string() == false)
     return;
 
+  pp::Var mime_type_var(pp::PASS_REF, mime_type_arg);
+  if (mime_type_var.is_string() == false)

[xhwang, 2012/10/26 06:19:30]

not sure if it's ppapi's conventon, but why not just
if (!mime_type_var.is_string)
?
also on line 36, 44 and probably more places in this file

[ddorwin, 2012/10/26 18:37:06]

Just to verify, "" will pass this, right?

[Tom Finegan, 2012/10/26 22:51:33]

xhwang's comment: Done.
ddorwin's comment: Works on my machine... :)

+    return;
+
   pp::Var init_data_var(pp::PASS_REF, init_data_arg);
   if (init_data_var.is_array_buffer() == false)
     return;
   pp::VarArrayBuffer init_data_array_buffer(init_data_var);
 
   static_cast<ContentDecryptor_Private*>(object)->GenerateKeyRequest(
       key_system_var.AsString(),
+      mime_type_var.AsString(),
       init_data_array_buffer);
 }
 
 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)
@@ skipping 276 matching lines @@
     const PP_DecryptedBlockInfo& decrypted_block_info) {
   if (has_interface<PPB_ContentDecryptor_Private>()) {
     get_interface<PPB_ContentDecryptor_Private>()->DeliverSamples(
         associated_instance_.pp_instance(),
         audio_frames.pp_resource(),
         &decrypted_block_info);
   }
 }
 
 }  // namespace pp