Encrypted Media: Allows empty key message to be fired.

webkit/media/crypto/ppapi/clear_key_cdm.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/media/crypto/ppapi/clear_key_cdm.h"
 
 #include <algorithm>
 #include <sstream>
 #include <string>
 #include <vector>
@@ skipping 217 matching lines @@
                                 init_data, init_data_size);
 
   if (client_.status() != Client::kKeyMessage)
     return cdm::kSessionError;
 
   DCHECK(key_request);
   key_request->set_session_id(client_.session_id().data(),
                               client_.session_id().size());
   latest_session_id_ = client_.session_id();
 
-  // TODO(tomfinegan): Get rid of this copy.
-  key_request->set_message(allocator_->Allocate(client_.key_message_length()));
-  DCHECK(key_request->message());
-  DCHECK_EQ(key_request->message()->size(), client_.key_message_length());
-  memcpy(key_request->message()->data(),
-         client_.key_message(), client_.key_message_length());
+  if (client_.key_message_length()) {
+    // TODO(tomfinegan): Get rid of this copy.
+    key_request->set_message(
+        allocator_->Allocate(client_.key_message_length()));
+    DCHECK(key_request->message());
+    DCHECK_EQ(key_request->message()->size(), client_.key_message_length());
+    memcpy(key_request->message()->data(),
+           client_.key_message(), client_.key_message_length());
+  } else {
+    key_request->set_message(NULL);

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

Is this not the default?

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

You are right. Added DCHECK and removed "else".

+  }
 
   key_request->set_default_url(client_.default_url().data(),
                                client_.default_url().size());
 
   return cdm::kSuccess;
 }
 
 cdm::Status ClearKeyCdm::AddKey(const char* session_id,
                                 int session_id_size,
                                 const uint8_t* key,
@@ skipping 345 matching lines @@
 
   static unsigned char color = 0;
   color += 10;
 
   memset(reinterpret_cast<void*>(video_frame->frame_buffer()->data()),
          color, frame_size);
 }
 #endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
 
 }  // namespace webkit_media