Restore CDM context on Resume().

media/base/pipeline_impl.h

 // Copyright (c) 2016 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.
 
 #ifndef MEDIA_BASE_PIPELINE_IMPL_H_
 #define MEDIA_BASE_PIPELINE_IMPL_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 173 matching lines @@
 
   // Carries out notifying filters that we are seeking to a new timestamp.
   void SeekTask(base::TimeDelta time, const PipelineStatusCB& seek_cb);
 
   // Carries out setting the |cdm_context| in |renderer_|, and then fires
   // |cdm_attached_cb| with the result. If |renderer_| is null,
   // |cdm_attached_cb| will be fired immediately with true, and |cdm_context|
   // will be set in |renderer_| later when |renderer_| is created.
   void SetCdmTask(CdmContext* cdm_context,
                   const CdmAttachedCB& cdm_attached_cb);
+  void OnCdmAttached(const CdmAttachedCB& cdm_attached_cb,
+                     CdmContext* cdm_context,
+                     bool success);
 
   // Callbacks executed when a renderer has ended.
   void OnRendererEnded();
   void OnTextRendererEnded();
   void RunEndedCallbackIfNeeded();
 
   scoped_ptr<TextRenderer> CreateTextRenderer();
 
   // Carries out adding a new text stream to the text renderer.
   void AddTextStreamTask(DemuxerStream* text_stream,
@@ skipping 105 matching lines @@
 
   // Holds the initialized renderers. Used for setting the volume,
   // playback rate, and determining when playback has finished.
   scoped_ptr<Renderer> renderer_;
   scoped_ptr<TextRenderer> text_renderer_;
 
   PipelineStatistics statistics_;
 
   scoped_ptr<SerialRunner> pending_callbacks_;
 
-  // CdmContext to be used to decrypt (and decode) encrypted stream in this
-  // pipeline. Non-null only when SetCdm() is called and the pipeline has not
-  // been started. Then during Start(), this value will be set on |renderer_|.
-  CdmContext* pending_cdm_context_;
+  // The CdmContext to be used to decrypt (and decode) encrypted stream in this
+  // pipeline. It is set when SetCdm() succeeds on the renderer (or when
+  // SetCdm() is called before Start()), after which it is guaranteed to outlive
+  // this pipeline. The saved value will be used to configure new renderers,
+  // when starting or resuming.
+  CdmContext* cdm_context_;
 
   base::ThreadChecker thread_checker_;
 
-  // NOTE: Weak pointers must be invalidated before all other member variables.
+  // A weak pointer that can be safely copied on the media thread.
+  base::WeakPtr<PipelineImpl> weak_this_;
+
+  // Weak pointers must be created on the main thread, and must be dereferenced
+  // on the media thread.
+  //
+  // Declared last so that weak pointers will be invalidated before all other
+  // member variables.
   base::WeakPtrFactory<PipelineImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PipelineImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_PIPELINE_IMPL_H_