Bug 1402584. P1 - Backed out changeset 442e8020e2ac. r=gerald

MozReview-Commit-ID: JqZJDTMyKGm

--HG--
extra : rebase_source : 944bc58aa562de066854668746e4af158d747484
extra : source : 394da3f085e52296e62af852add26e72fa688a62

dom/html/HTMLMediaElement.cpp

@@ -2845,17 +2845,6 @@ HTMLMediaElement::Seek(double aTime,
 
   mPlayingBeforeSeek = IsPotentiallyPlaying();
 
-#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
-  if (!mDecoder->IsMetadataLoaded()) {
-    // This is for debugging bug 1402584.
-    // We should reach here only after metadata loaded by the decoder.
-    MOZ_CRASH_UNSAFE_PRINTF(
-      "Metadata not loaded! readyState=%d networkState=%d",
-      static_cast<int>(mReadyState.Ref()),
-      static_cast<int>(mNetworkState));
-  }
-#endif
-
   // The media backend is responsible for dispatching the timeupdate
   // event if it changes the playback position as a result of the seek.
   LOG(LogLevel::Debug, ("%p SetCurrentTime(%f) starting seek", this, aTime));
@@ -6053,16 +6042,6 @@ void HTMLMediaElement::ChangeReadyState(nsMediaReadyState aState)
       mReadyState >= nsIDOMHTMLMediaElement::HAVE_ENOUGH_DATA) {
     DispatchAsyncEvent(NS_LITERAL_STRING("canplaythrough"));
   }
-
-#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
-  if (mReadyState >= nsIDOMHTMLMediaElement::HAVE_METADATA && mDecoder &&
-      !mDecoder->IsMetadataLoaded()) {
-    MOZ_CRASH_UNSAFE_PRINTF(
-      "Metadata not loaded! readyState=%d networkState=%d",
-      static_cast<int>(mReadyState.Ref()),
-      static_cast<int>(mNetworkState));
-  }
-#endif
 }
 
 static const char* const gNetworkStateToString[] = {

dom/media/MediaDecoder.h

@@ -240,9 +240,6 @@ public:
   // are buffered and playable.
   virtual media::TimeIntervals GetBuffered();
 
-  // For debugging bug 1402584.
-  bool IsMetadataLoaded() const { return !!mInfo; }
-
   // Returns the size, in bytes, of the heap memory used by the currently
   // queued decoded video and audio data.
   size_t SizeOfVideoQueue();