Handle plugin instance crash in ContentDecryptorDelegate.

content/renderer/pepper/content_decryptor_delegate.h

 // Copyright (c) 2012 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 CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
 #define CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
 
 #include <queue>
 #include <string>
 
@@ skipping 22 matching lines @@
 class ContentDecryptorDelegate {
  public:
   // ContentDecryptorDelegate does not take ownership of
   // |plugin_decryption_interface|. Therefore |plugin_decryption_interface|
   // must outlive this object.
   ContentDecryptorDelegate(
       PP_Instance pp_instance,
       const PPP_ContentDecryptor_Private* plugin_decryption_interface);
   ~ContentDecryptorDelegate();
 
-  void Initialize(const std::string& key_system);
+  void Initialize(const std::string& key_system,

[ddorwin, 2014/01/08 23:40:32]

Should we document in this public interface that plugin errors are terminal and
this object should not be used if plugin_error_cb is called? Alternatively/in
addition, maybe something stronger than "error". fatal_plugin_error_cb?

[xhwang, 2014/01/09 01:58:49]

Done.

+                  const media::SessionCreatedCB& session_created_cb,
+                  const media::SessionMessageCB& session_message_cb,
+                  const media::SessionReadyCB& session_ready_cb,
+                  const media::SessionClosedCB& session_closed_cb,
+                  const media::SessionErrorCB& session_error_cb,
+                  const base::Closure& plugin_error_cb);
 
-  void SetSessionEventCallbacks(
-      const media::SessionCreatedCB& session_created_cb,
-      const media::SessionMessageCB& session_message_cb,
-      const media::SessionReadyCB& session_ready_cb,
-      const media::SessionClosedCB& session_closed_cb,
-      const media::SessionErrorCB& session_error_cb);
+  void InstanceCrashed();
 
   // Provides access to PPP_ContentDecryptor_Private.
   bool CreateSession(uint32 session_id,
                      const std::string& type,
                      const uint8* init_data,
                      int init_data_length);
   bool UpdateSession(uint32 session_id,
                      const uint8* response,
                      int response_length);
   bool ReleaseSession(uint32 session_id);
@@ skipping 41 matching lines @@
   void DeliverFrame(PP_Resource decrypted_frame,
                     const PP_DecryptedFrameInfo* frame_info);
   void DeliverSamples(PP_Resource audio_frames,
                       const PP_DecryptedSampleInfo* sample_info);
 
  private:
   template <typename Callback>
   class TrackableCallback {
    public:
     TrackableCallback() : id_(0u) {}
-    // TODO(xhwang): Check that no callback is pending in dtor.
-    ~TrackableCallback() {};
+    ~TrackableCallback() {
+      // Callbacks must be satisfied.
+      DCHECK_EQ(id_, 0u);
+      DCHECK(is_null());
+    };
 
     bool Matches(uint32_t id) const { return id == id_; }
 
     bool is_null() const { return cb_.is_null(); }
 
     void Set(uint32_t id, const Callback& cb) {
       DCHECK_EQ(id_, 0u);
       DCHECK(cb_.is_null());
       id_ = id;
       cb_ = cb;
@@ skipping 31 matching lines @@
 
   void SetBufferToFreeInTrackingInfo(PP_DecryptTrackingInfo* tracking_info);
 
   // Deserializes audio data stored in |audio_frames| into individual audio
   // buffers in |frames|. Returns true upon success.
   bool DeserializeAudioFrames(PP_Resource audio_frames,
                               size_t data_size,
                               media::SampleFormat sample_format,
                               media::Decryptor::AudioBuffers* frames);
 
+  void SatisfyAllPendingCallbacksOnError();
+
   const PP_Instance pp_instance_;
   const PPP_ContentDecryptor_Private* const plugin_decryption_interface_;
 
   // TODO(ddorwin): Remove after updating the Pepper API to not use key system.
   std::string key_system_;
 
   // Callbacks for firing session events.
   media::SessionCreatedCB session_created_cb_;
   media::SessionMessageCB session_message_cb_;
   media::SessionReadyCB session_ready_cb_;
   media::SessionClosedCB session_closed_cb_;
   media::SessionErrorCB session_error_cb_;
 
+  // Callback to notify that unexpected error happened and |this| should not
+  // be used anymore.
+  base::Closure plugin_error_cb_;
+
   gfx::Size natural_size_;
 
   // Request ID for tracking pending content decryption callbacks.
   // Note that zero indicates an invalid request ID.
   // TODO(xhwang): Add completion callbacks for Reset/Stop and remove the use
   // of request IDs.
   uint32_t next_decryption_request_id_;
 
   TrackableCallback<media::Decryptor::DecryptCB> audio_decrypt_cb_;
   TrackableCallback<media::Decryptor::DecryptCB> video_decrypt_cb_;
@@ skipping 14 matching lines @@
 
   base::WeakPtr<ContentDecryptorDelegate> weak_this_;
   base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_