Backed out changeset 2964dba33ef8 (bug 1390748)

--HG--
extra : rebase_source : f42c1924d26ca39d2fbe926055f53ff92bb25b69

dom/media/MediaDecoder.cpp

@@ -1621,14 +1621,6 @@ MediaDecoder::RequestDebugInfo()
     });
 }
 
-void
-MediaDecoder::GetMozDebugReaderData(nsACString& aString)
-{
-  if (mReader) {
-    mReader->GetMozDebugReaderData(aString);
-  }
-}
-
 void
 MediaDecoder::NotifyAudibleStateChanged()
 {

dom/media/MediaDecoder.h

@@ -406,7 +406,7 @@ private:
 
   // Returns a string describing the state of the media player internal
   // data. Used for debugging purposes.
-  virtual void GetMozDebugReaderData(nsACString& aString);
+  virtual void GetMozDebugReaderData(nsACString& aString) { }
 
   virtual void DumpDebugInfo();
 

dom/media/fmp4/MP4Decoder.cpp

@@ -278,4 +278,12 @@ MP4Decoder::IsVideoAccelerated(layers::KnowsCompositor* aKnowsCompositor, nsIGlo
   return promise.forget();
 }
 
+void
+MP4Decoder::GetMozDebugReaderData(nsACString& aString)
+{
+  if (mReader) {
+    mReader->GetMozDebugReaderData(aString);
+  }
+}
+
 } // namespace mozilla

dom/media/fmp4/MP4Decoder.h

@@ -42,6 +42,8 @@ public:
   static already_AddRefed<dom::Promise>
   IsVideoAccelerated(layers::KnowsCompositor* aKnowsCompositor, nsIGlobalObject* aParent);
 
+  void GetMozDebugReaderData(nsACString& aString) override;
+
 private:
   ChannelMediaDecoder* CloneImpl(MediaDecoderInit& aInit) override
   {

dom/media/webm/WebMDecoder.cpp

@@ -58,5 +58,13 @@ WebMDecoder::IsSupportedType(const MediaContainerType& aContainerType)
   return true;
 }
 
+void
+WebMDecoder::GetMozDebugReaderData(nsACString& aString)
+{
+  if (mReader) {
+    mReader->GetMozDebugReaderData(aString);
+  }
+}
+
 } // namespace mozilla
 

dom/media/webm/WebMDecoder.h

@@ -25,6 +25,8 @@ public:
   // If provided, codecs are checked for support.
   static bool IsSupportedType(const MediaContainerType& aContainerType);
 
+  void GetMozDebugReaderData(nsACString& aString) override;
+
 private:
   ChannelMediaDecoder* CloneImpl(MediaDecoderInit& aInit) override
   {