Bug 1380532. P2 - remove AbstractMediaDecoder::GetCrashHelper(). draft
authorJW Wang <jwwang@mozilla.com>
Thu, 13 Jul 2017 10:21:34 +0800
changeset 608732 4324709123480500556600c54cce29bd73e5e22b
parent 608731 fd99e7d5b10c48fb87a3480eb6d82734d1b8a03b
child 608840 20bfdcbd7e93e7b9395b90c8bd35661ee4a16792
push id68395
push userjwwang@mozilla.com
push dateFri, 14 Jul 2017 04:26:14 +0000
bugs1380532
milestone56.0a1
Bug 1380532. P2 - remove AbstractMediaDecoder::GetCrashHelper(). MozReview-Commit-ID: IDPifgdxwTd
dom/media/AbstractMediaDecoder.h
dom/media/MediaDecoder.cpp
dom/media/MediaDecoder.h
--- a/dom/media/AbstractMediaDecoder.h
+++ b/dom/media/AbstractMediaDecoder.h
@@ -67,18 +67,16 @@ public:
 
   // Returns the owner of this decoder or null when the decoder is shutting
   // down. The owner should only be used on the main thread.
   virtual MediaDecoderOwner* GetOwner() const = 0;
 
   // Set by Reader if the current audio track can be offloaded
   virtual void SetPlatformCanOffloadAudio(bool aCanOffloadAudio) { }
 
-  virtual already_AddRefed<GMPCrashHelper> GetCrashHelper() { return nullptr; }
-
   // Stack based class to assist in notifying the frame statistics of
   // parsed and decoded frames. Use inside video demux & decode functions
   // to ensure all parsed and decoded frames are reported on all return paths.
   class AutoNotifyDecoded
   {
   public:
     explicit AutoNotifyDecoded(AbstractMediaDecoder* aDecoder)
       : mDecoder(aDecoder)
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -721,23 +721,16 @@ MediaDecoder::IsSeeking() const
 bool
 MediaDecoder::OwnerHasError() const
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_DIAGNOSTIC_ASSERT(!IsShutdown());
   return GetOwner()->HasError();
 }
 
-already_AddRefed<GMPCrashHelper>
-MediaDecoder::GetCrashHelper()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  return GetOwner()->CreateGMPCrashHelper();
-}
-
 bool
 MediaDecoder::IsEnded() const
 {
   MOZ_ASSERT(NS_IsMainThread());
   return mPlayState == PLAY_STATE_ENDED;
 }
 
 bool
--- a/dom/media/MediaDecoder.h
+++ b/dom/media/MediaDecoder.h
@@ -210,18 +210,16 @@ public:
 
   // True if we are playing a MediaSource object.
   virtual bool IsMSE() const { return false; }
 
   // Return true if the MediaDecoderOwner's error attribute is not null.
   // Must be called before Shutdown().
   bool OwnerHasError() const;
 
-  already_AddRefed<GMPCrashHelper> GetCrashHelper() override;
-
 public:
   // Returns true if this media supports random seeking. False for example with
   // chained ogg files.
   bool IsMediaSeekable();
   // Returns true if seeking is supported on a transport level (e.g. the server
   // supports range requests, we are playing a file, etc.).
   bool IsTransportSeekable();