Encrypted Media: Allows empty key message to be fired.

webkit/plugins/ppapi/content_decryptor_delegate.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 "webkit/plugins/ppapi/content_decryptor_delegate.h"
 
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop_proxy.h"
 #include "media/base/audio_decoder_config.h"
@@ skipping 622 matching lines @@
 
   StringVar* key_system_string = StringVar::FromPPVar(key_system_var);
   StringVar* session_id_string = StringVar::FromPPVar(session_id_var);
   StringVar* default_url_string = StringVar::FromPPVar(default_url_var);
 
   if (!key_system_string || !session_id_string || !default_url_string) {
     decryptor_client_->KeyError("", "", media::Decryptor::kUnknownError, 0);
     return;
   }
 
-  EnterResourceNoLock<PPB_Buffer_API> enter(message_resource, true);
-  if (!enter.succeeded()) {
-    decryptor_client_->KeyError(key_system_string->value(),
-                                session_id_string->value(),
-                                media::Decryptor::kUnknownError,
-                                0);
-    return;
+  scoped_array<uint8> message_array;
+  int message_size = 0;
+
+  if (message_resource) {
+    EnterResourceNoLock<PPB_Buffer_API> enter(message_resource, true);
+    if (!enter.succeeded()) {
+      decryptor_client_->KeyError(key_system_string->value(),
+                                  session_id_string->value(),
+                                  media::Decryptor::kUnknownError,
+                                  0);
+      return;
+    }
+
+    BufferAutoMapper mapper(enter.object());
+    if (!mapper.data() || !mapper.size()) {
+      decryptor_client_->KeyError(key_system_string->value(),
+                                  session_id_string->value(),
+                                  media::Decryptor::kUnknownError,
+                                  0);
+      return;
+    }
+
+    message_size = mapper.size();
+    message_array.reset(new uint8[message_size]);
+    memcpy(message_array.get(), mapper.data(), mapper.size());
   }
 
-  BufferAutoMapper mapper(enter.object());
-  scoped_array<uint8> message_array(new uint8[mapper.size()]);
-  if (mapper.data() && mapper.size())
-    memcpy(message_array.get(), mapper.data(), mapper.size());
+  LOG(ERROR) << "ContentDecryptorDelegate::KeyMessage";

[ddorwin, 2012/12/04 01:44:10]

Did you mean to keep this here? Should at least not be ERROR.

[xhwang, 2012/12/04 01:58:51]

oops, removed.

 
   decryptor_client_->KeyMessage(key_system_string->value(),
                                 session_id_string->value(),
                                 message_array.Pass(),
-                                mapper.size(),
+                                message_size,
                                 default_url_string->value());
 }
 
 void ContentDecryptorDelegate::KeyError(PP_Var key_system_var,
                                         PP_Var session_id_var,
                                         int32_t media_error,
                                         int32_t system_code) {
   if (!decryptor_client_)
     return;
 
@@ skipping 298 matching lines @@
     return false;
   }
   memcpy(mapper.data(), data, size);
 
   *resource = media_resource;
   return true;
 }
 
 }  // namespace ppapi
 }  // namespace webkit