Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(558)

Unified Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.h

Issue 166273009: PpapiDecryptor: Call NewKeyCB on OnSessionReady(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.h
diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
index be77340b88a3b277de1844d3b440cb654823caab..a79d62b1eeda999bb7e9aa2a3bfde8a5bbebcfec 100644
--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
@@ -70,7 +70,7 @@ class ClearKeyCdm : public ClearKeyCdmInterface {
private:
// Emulates a session stored for |session_id_for_emulated_loadsession_|. This
// is necessary since aes_decryptor.cc does not support storing sessions.
- void UpdateLoadableSession();
+ void LoadLoadableSession();
// ContentDecryptionModule callbacks.
void OnSessionCreated(uint32 session_id, const std::string& web_session_id);
@@ -133,9 +133,9 @@ class ClearKeyCdm : public ClearKeyCdmInterface {
// Timer delay in milliseconds for the next host_->SetTimer() call.
int64 timer_delay_ms_;
- // Indicates whether a timer has been set to prevent multiple timers from
- // running.
- bool timer_set_;
+ // Indicates whether a heartbeat timer has been set to prevent multiple timers
+ // from running.
+ bool heartbeat_timer_set_;
#if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
int channel_count_;
« no previous file with comments | « content/renderer/media/crypto/ppapi_decryptor.cc ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698