PpapiDecryptor: Call NewKeyCB on OnSessionReady().

content/renderer/media/crypto/ppapi_decryptor.cc

 // Copyright 2013 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 "content/renderer/media/crypto/ppapi_decryptor.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 119 matching lines @@
                                    const uint8* response,
                                    int response_length) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
 
   if (!plugin_cdm_delegate_ || !plugin_cdm_delegate_->UpdateSession(
                                     session_id, response, response_length)) {
     ReportFailureToCallPlugin(session_id);
     return;
   }
-
-  if (!new_audio_key_cb_.is_null())
-    new_audio_key_cb_.Run();
-
-  if (!new_video_key_cb_.is_null())
-    new_video_key_cb_.Run();
 }
 
 void PpapiDecryptor::ReleaseSession(uint32 session_id) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
 
   if (!plugin_cdm_delegate_ ||
       !plugin_cdm_delegate_->ReleaseSession(session_id)) {
     ReportFailureToCallPlugin(session_id);
     return;
@@ skipping 189 matching lines @@
 
 void PpapiDecryptor::OnSessionMessage(uint32 session_id,
                                       const std::vector<uint8>& message,
                                       const std::string& destination_url) {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   session_message_cb_.Run(session_id, message, destination_url);
 }
 
 void PpapiDecryptor::OnSessionReady(uint32 session_id) {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
+
+  // Based on the spec, we need to resume playback when a session is updated, or

[ddorwin, 2014/02/19 00:38:13]

"updated" is a bit ambiguous. It's really when update() completes successfully.

[xhwang, 2014/02/19 00:46:42]

Done.

+  // when a session is loaded. In both cases, the CDM fires OnSessionReady()

[ddorwin, 2014/02/19 00:38:13]

same/similar: successfully loaded

[xhwang, 2014/02/19 00:46:42]

Done.

+  // event. So we choose to call the NewKeyCBs here.
+  // TODO(xhwang): Rename OnSessionReady callback to OnSessionUpdated.

[ddorwin, 2014/02/19 00:38:13]

SessionUpdated does not seem to cover the loaded case. Also, since "The user
agent may choose to skip this step if it knows resuming will fail (i.e. no
usable key was added)", we can be more precise. I really think this callback
should indicate that a new key is available or available again.

[xhwang, 2014/02/19 00:46:42]

Done.

+  if (!new_audio_key_cb_.is_null())
+    new_audio_key_cb_.Run();
+
+  if (!new_video_key_cb_.is_null())
+    new_video_key_cb_.Run();
+
   session_ready_cb_.Run(session_id);
 }
 
 void PpapiDecryptor::OnSessionClosed(uint32 session_id) {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   session_closed_cb_.Run(session_id);
 }
 
 void PpapiDecryptor::OnSessionError(uint32 session_id,
                                     media::MediaKeys::KeyError error_code,
                                     int system_code) {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   session_error_cb_.Run(session_id, error_code, system_code);
 }
 
 void PpapiDecryptor::OnFatalPluginError() {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   DCHECK(plugin_cdm_delegate_);
   plugin_cdm_delegate_ = NULL;
   plugin_instance_ = NULL;
   base::ResetAndReturn(&destroy_plugin_cb_).Run();
 }
 
 }  // namespace content