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

Unified Diff: content/renderer/media/cdm/ppapi_decryptor.h

Issue 2625333003: media: Always provide CdmContext when selecting decoder in DecoderStream (Closed)
Patch Set: rebase only Created 3 years, 11 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 | « no previous file | content/renderer/media/cdm/ppapi_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/cdm/ppapi_decryptor.h
diff --git a/content/renderer/media/cdm/ppapi_decryptor.h b/content/renderer/media/cdm/ppapi_decryptor.h
index 95137fefe01d377f1f7eba612f11e0a79d1387c7..107c655db14fe1f2b136a468f0aff5087ea43478 100644
--- a/content/renderer/media/cdm/ppapi_decryptor.h
+++ b/content/renderer/media/cdm/ppapi_decryptor.h
@@ -13,6 +13,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
+#include "base/synchronization/lock.h"
#include "content/renderer/media/cdm/pepper_cdm_wrapper.h"
#include "media/base/cdm_context.h"
#include "media/base/cdm_factory.h"
@@ -148,6 +149,9 @@ class PpapiDecryptor : public media::ContentDecryptionModule,
NewKeyCB new_audio_key_cb_;
NewKeyCB new_video_key_cb_;
+ base::Lock lock_; // Protects |had_fatal_plugin_error_|.
+ bool had_fatal_plugin_error_ = false;
+
// NOTE: Weak pointers must be invalidated before all other member variables.
base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
« no previous file with comments | « no previous file | content/renderer/media/cdm/ppapi_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698