Source release 14.2.0

core/include/cdm_engine.h

@@ -341,6 +341,17 @@ class CdmEngine {
   // Protect release_key_sets_ from non-thread-safe operations.
   Lock release_key_sets_lock_;
 
+  // TODO(rfrias): Replace with two sets of locks, one to protect
+  // the CdmSessionMap and a per-session lock to control access to
+  // session usage/destruction.
+  // Locks the session map |session_map_| and session usage/destruction
+  // between session management calls (OpenSession, CloseSession, etc),
+  // periodic timer calls (OnTimerEvent), and calls to Decrypt.
+  // The layer above the CDM implementation is expected to handle thread
+  // synchronization to make sure other functions that access sessions do not
+  // occur simultaneously with OpenSession or CloseSession.
+  Lock session_map_lock_;
+
   CORE_DISALLOW_COPY_AND_ASSIGN(CdmEngine);
 };