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

Unified Diff: content/renderer/media/crypto/proxy_decryptor.cc

Issue 193303002: WeakPtr destruction order cleanup: media edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 9 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
« no previous file with comments | « content/renderer/media/crypto/proxy_decryptor.h ('k') | content/renderer/media/rtc_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/crypto/proxy_decryptor.cc
diff --git a/content/renderer/media/crypto/proxy_decryptor.cc b/content/renderer/media/crypto/proxy_decryptor.cc
index 10408105c07d24be75de3fd37eb5a64aa7dd49a3..72b11581201fe30546e61f56dbc165a5488198fe 100644
--- a/content/renderer/media/crypto/proxy_decryptor.cc
+++ b/content/renderer/media/crypto/proxy_decryptor.cc
@@ -47,7 +47,7 @@ ProxyDecryptor::ProxyDecryptor(
const KeyAddedCB& key_added_cb,
const KeyErrorCB& key_error_cb,
const KeyMessageCB& key_message_cb)
- : weak_ptr_factory_(this),
+ :
#if defined(ENABLE_PEPPER_CDMS)
create_pepper_cdm_cb_(create_pepper_cdm_cb),
#elif defined(OS_ANDROID)
@@ -57,7 +57,8 @@ ProxyDecryptor::ProxyDecryptor(
key_added_cb_(key_added_cb),
key_error_cb_(key_error_cb),
key_message_cb_(key_message_cb),
- is_clear_key_(false) {
+ is_clear_key_(false),
+ weak_ptr_factory_(this) {
#if defined(ENABLE_PEPPER_CDMS)
DCHECK(!create_pepper_cdm_cb_.is_null());
#endif // defined(ENABLE_PEPPER_CDMS)
« no previous file with comments | « content/renderer/media/crypto/proxy_decryptor.h ('k') | content/renderer/media/rtc_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698