Fix various MediaSource related crashes on Android.

webkit/media/android/media_source_delegate.h

 // Copyright (c) 2013 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 WEBKIT_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
 #define WEBKIT_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 21 matching lines @@
 namespace webkit_media {
 
 class ProxyDecryptor;
 class WebMediaPlayerProxyAndroid;
 
 class MediaSourceDelegate : public media::DemuxerHost {
  public:
   typedef base::Callback<void(WebKit::WebMediaPlayer::NetworkState)>
       UpdateNetworkStateCB;
 
+  // Helper class used by scoped_ptr to destroy an instance of
+  // MediaSourceDelegate.
+  class Destroyer {
+   public:
+    inline void operator()(void* x) const {

[qinmin, 2013/05/22 18:51:24]

nit： s/x/media_source_delegate/

[acolwell GONE FROM CHROMIUM, 2013/05/22 19:12:09]

Done.

+      MediaSourceDelegate* delegate = static_cast<MediaSourceDelegate*>(x);
+      delegate->Destroy();
+    }
+  };
+
   MediaSourceDelegate(WebKit::WebFrame* frame,
                       WebKit::WebMediaPlayerClient* client,
                       WebMediaPlayerProxyAndroid* proxy,
                       int player_id,
                       media::MediaLog* media_log);
-  virtual ~MediaSourceDelegate();
-
   // Initialize the MediaSourceDelegate. |media_source| will be owned by
   // this object after this call.
   void Initialize(WebKit::WebMediaSource* media_source,
                   const UpdateNetworkStateCB& update_network_state_cb);
 
   const WebKit::WebTimeRanges& Buffered();
   size_t DecodedFrameCount() const;
   size_t DroppedFrameCount() const;
   size_t AudioDecodedByteCount() const;
   size_t VideoDecodedByteCount() const;
@@ skipping 13 matching lines @@
       const WebKit::WebString& key_system,
       const WebKit::WebString& session_id);
 
   void Seek(base::TimeDelta time);
 
   // Called when DemuxerStreamPlayer needs to read data from ChunkDemuxer.
   // If it's the first request after the seek, |seek_done| will be true.
   void OnReadFromDemuxer(media::DemuxerStream::Type type, bool seek_done);
 
  private:
+  friend Destroyer;
+
+  // This is private to enforce use of the Destroyer.
+  virtual ~MediaSourceDelegate();
+
+  // Called by the Destroyer to destroy an instance of this object.
+  void Destroy();
+
   // Methods inherited from DemuxerHost.
   virtual void SetTotalBytes(int64 total_bytes) OVERRIDE;
   virtual void AddBufferedByteRange(int64 start, int64 end) OVERRIDE;
   virtual void AddBufferedTimeRange(base::TimeDelta start,
                                     base::TimeDelta end) OVERRIDE;
   virtual void SetDuration(base::TimeDelta duration) OVERRIDE;
   virtual void OnDemuxerError(media::PipelineStatus status) OVERRIDE;
 
   // Callbacks for ChunkDemuxer & Decryptor.
   void OnDemuxerInitDone(media::PipelineStatus status);
+  void OnDemuxerStopDone();
   void OnDemuxerOpened();
   void OnKeyAdded(const std::string& key_system, const std::string& session_id);
   void OnKeyError(const std::string& key_system,
                   const std::string& session_id,
                   media::Decryptor::KeyError error_code,
                   int system_code);
   void OnKeyMessage(const std::string& key_system,
                     const std::string& session_id,
                     const std::string& message,
                     const std::string& default_url);
@@ skipping 14 matching lines @@
       media::DemuxerStream* stream,
       media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params* params,
       size_t index,
       media::DemuxerStream::Status status,
       const scoped_refptr<media::DecoderBuffer>& buffer);
 
   void NotifyDemuxerReady(const std::string& key_system);
 
   base::WeakPtrFactory<MediaSourceDelegate> weak_this_;
 
-  WebKit::WebMediaPlayerClient* const client_;
+  WebKit::WebMediaPlayerClient* client_;
   WebMediaPlayerProxyAndroid* proxy_;
   int player_id_;
 
   scoped_refptr<media::MediaLog> media_log_;
   UpdateNetworkStateCB update_network_state_cb_;
 
   scoped_ptr<media::ChunkDemuxer> chunk_demuxer_;
   scoped_ptr<WebKit::WebMediaSource> media_source_;
 
   media::PipelineStatistics statistics_;
@@ skipping 15 matching lines @@
   scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> audio_params_;
   scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> video_params_;
 
   bool seeking_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
 };
 
 }  // namespace webkit_media
 #endif  // WEBKIT_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
-