Refactor CdmPromise and related classes

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.h"
@@ skipping 10 matching lines @@
 #include "media/base/data_buffer.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 
 namespace content {
 
 // This class is needed so that resolving an Update() promise triggers playback
 // of the stream. It intercepts the resolve() call to invoke an additional
 // callback.
-class SessionUpdatedPromise : public media::SimpleCdmPromise {
+class SessionUpdatedPromise : public media::CdmPromiseTemplate<void> {

[ddorwin, 2014/09/26 22:40:00]

Would CdmCallbackPromise be a better fit (even if reject CB is null)?
ditto below.

[jrummell, 2014/09/29 22:08:38]

Nope. It needs to call resolve/reject on the passed in CdmPromise as well as the
additional cb on resolve().

  public:
   SessionUpdatedPromise(scoped_ptr<media::SimpleCdmPromise> caller_promise,
                         base::Closure additional_resolve_cb)
       : caller_promise_(caller_promise.Pass()),
         additional_resolve_cb_(additional_resolve_cb) {}
 
   virtual void resolve() OVERRIDE {

[ddorwin, 2014/09/26 22:40:00]

Note that there is currently no is_pending_ check for this class because the
parent does not define it.

[jrummell, 2014/09/29 22:08:38]

Done.

-    DCHECK(is_pending_);
-    is_pending_ = false;
     additional_resolve_cb_.Run();
     caller_promise_->resolve();
   }
 
   virtual void reject(media::MediaKeys::Exception exception_code,
                       uint32 system_code,
                       const std::string& error_message) OVERRIDE {
-    DCHECK(is_pending_);
-    is_pending_ = false;
     caller_promise_->reject(exception_code, system_code, error_message);
   }
 
  protected:
   scoped_ptr<media::SimpleCdmPromise> caller_promise_;
   base::Closure additional_resolve_cb_;
 };
 
 // This class is needed so that resolving a SessionLoaded() promise triggers
 // playback of the stream. It intercepts the resolve() call to invoke an
 // additional callback. This is only needed until KeysChange event gets passed
 // through Pepper.
-class SessionLoadedPromise : public media::NewSessionCdmPromise {
+class SessionLoadedPromise : public media::CdmPromiseTemplate<std::string> {

[xhwang, 2014/09/29 18:32:58]

Can we merge SessionUpdatedPromise and SessionLoadedPromise into something like
CdmAdditionalCallbackPromise?

[jrummell, 2014/09/29 22:08:38]

Could be done, although it would be no less code. These should be removed soon
(once WV starts generating the KeysChanged event), so it's not worth the effort.

  public:
   SessionLoadedPromise(scoped_ptr<media::NewSessionCdmPromise> caller_promise,
                        base::Closure additional_resolve_cb)
       : caller_promise_(caller_promise.Pass()),
         additional_resolve_cb_(additional_resolve_cb) {}
 
   virtual void resolve(const std::string& web_session_id) OVERRIDE {
-    DCHECK(is_pending_);
-    is_pending_ = false;
     additional_resolve_cb_.Run();
     caller_promise_->resolve(web_session_id);
   }
 
   virtual void reject(media::MediaKeys::Exception exception_code,
                       uint32 system_code,
                       const std::string& error_message) OVERRIDE {
-    DCHECK(is_pending_);
-    is_pending_ = false;
     caller_promise_->reject(exception_code, system_code, error_message);
   }
 
  protected:
   scoped_ptr<media::NewSessionCdmPromise> caller_promise_;
   base::Closure additional_resolve_cb_;
 };
 
 scoped_ptr<PpapiDecryptor> PpapiDecryptor::Create(
     const std::string& key_system,
@@ skipping 458 matching lines @@
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   pepper_cdm_wrapper_.reset();
 }
 
 ContentDecryptorDelegate* PpapiDecryptor::CdmDelegate() {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   return (pepper_cdm_wrapper_) ? pepper_cdm_wrapper_->GetCdmDelegate() : NULL;
 }
 
 }  // namespace content