Chromium Code Reviews| Index: ppapi/cpp/private/content_decryptor_private.cc |
| diff --git a/ppapi/cpp/private/content_decryptor_private.cc b/ppapi/cpp/private/content_decryptor_private.cc |
| index 90842c37e0ed5da70a621f2c899ea00603b4a89b..b5c6e72e94868d9d441e726db3d251e3cccc1ea3 100644 |
| --- a/ppapi/cpp/private/content_decryptor_private.cc |
| +++ b/ppapi/cpp/private/content_decryptor_private.cc |
| @@ -25,6 +25,7 @@ static const char kPPPContentDecryptorInterface[] = |
| 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); |
| @@ -35,6 +36,10 @@ void GenerateKeyRequest(PP_Instance instance, |
| 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 ju
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 o
|
| + return; |
| + |
| pp::Var init_data_var(pp::PASS_REF, init_data_arg); |
| if (init_data_var.is_array_buffer() == false) |
| return; |
| @@ -42,6 +47,7 @@ void GenerateKeyRequest(PP_Instance instance, |
| static_cast<ContentDecryptor_Private*>(object)->GenerateKeyRequest( |
| key_system_var.AsString(), |
| + mime_type_var.AsString(), |
| init_data_array_buffer); |
| } |