Encrypted Media: Allows empty key message to be fired.

webkit/media/crypto/ppapi/cdm_wrapper.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 <cstring>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 536 matching lines @@
     }
   }
 
   LinkedKeyMessage key_request(new KeyMessageImpl());
   cdm::Status status = cdm_->GenerateKeyRequest(
       type.data(), type.size(),
       static_cast<const uint8_t*>(init_data.Map()),
       init_data.ByteLength(),
       key_request.get());
   PP_DCHECK(status == cdm::kSuccess || status == cdm::kSessionError);
-  if (status != cdm::kSuccess ||
-      !key_request->message() ||
-      key_request->message()->size() == 0) {
+  if (status != cdm::kSuccess) {
     FireKeyError("");
     return;
   }
 
   // TODO(xhwang): Remove unnecessary CallOnMain calls here and below once we
   // only support out-of-process.
   // If running out-of-process, PPB calls will always behave asynchronously
   // since IPC is involved. In that case, if we are already on main thread,
   // we don't need to use CallOnMain to help us call PPB call on main thread,
   // or to help call PPB asynchronously.
@@ skipping 239 matching lines @@
 }
 
 void CdmWrapper::KeyAdded(int32_t result, const std::string& session_id) {
   PP_DCHECK(result == PP_OK);
   pp::ContentDecryptor_Private::KeyAdded(key_system_, session_id);
 }
 
 void CdmWrapper::KeyMessage(int32_t result,
                             const LinkedKeyMessage& key_message) {
   PP_DCHECK(result == PP_OK);
-  pp::Buffer_Dev message_buffer =
-      static_cast<const PpbBuffer*>(key_message->message())->buffer_dev();
+
+  pp::Buffer_Dev message_buffer;
+  if (key_message->message()) {
+    message_buffer = static_cast<const PpbBuffer*>(
+        key_message->message())->buffer_dev();
+  }
+
   pp::ContentDecryptor_Private::KeyMessage(
       key_system_,
       key_message->session_id_string(),
       message_buffer,
       key_message->default_url_string());
 }
 
 // TODO(xhwang): Support MediaKeyError (see spec: http://goo.gl/rbdnR) in CDM
 // interface and in this function.
 void CdmWrapper::KeyError(int32_t result, const std::string& session_id) {
@@ skipping 149 matching lines @@
 }  // namespace webkit_media
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new webkit_media::CdmWrapperModule();
 }
 
 }  // namespace pp