Backed out changeset 4a31e4302e03 (bug 1390748)

--HG--
extra : rebase_source : 9571466ebc151a9788a380008c5d8941e3e24665

dom/base/nsContentUtils.cpp

@@ -22,6 +22,7 @@
 #include "jsfriendapi.h"
 #include "js/Value.h"
 #include "Layers.h"
+#include "MediaDecoder.h"
 #include "nsAppRunner.h"
 // nsNPAPIPluginInstance must be included before nsIDocument.h, which is included in mozAutoDocUpdate.h.
 #include "nsNPAPIPluginInstance.h"
@@ -47,6 +48,7 @@
 #include "mozilla/dom/FileSystemSecurity.h"
 #include "mozilla/dom/FileBlobImpl.h"
 #include "mozilla/dom/HTMLInputElement.h"
+#include "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/dom/HTMLTemplateElement.h"
 #include "mozilla/dom/HTMLContentElement.h"
 #include "mozilla/dom/HTMLShadowElement.h"

dom/html/HTMLMediaElement.cpp

@@ -7153,17 +7153,6 @@ HTMLMediaElement::NextFrameStatus()
   return NEXT_FRAME_UNINITIALIZED;
 }
 
-
-void
-HTMLMediaElement::SetDecoder(MediaDecoder* aDecoder)
-{
-  MOZ_ASSERT(aDecoder); // Use ShutdownDecoder() to clear.
-  if (mDecoder) {
-    ShutdownDecoder();
-  }
-  mDecoder = aDecoder;
-}
-
 float
 HTMLMediaElement::ComputedVolume() const
 {

dom/html/HTMLMediaElement.h

@@ -9,8 +9,6 @@
 #include "nsAutoPtr.h"
 #include "nsIDOMHTMLMediaElement.h"
 #include "nsGenericHTMLElement.h"
-#include "MediaEventSource.h"
-#include "SeekTarget.h"
 #include "MediaDecoderOwner.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIObserver.h"
@@ -20,6 +18,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/TextTrackManager.h"
 #include "mozilla/WeakPtr.h"
+#include "MediaDecoder.h"
 #include "mozilla/dom/MediaKeys.h"
 #include "mozilla/StateWatching.h"
 #include "nsGkAtoms.h"
@@ -50,9 +49,6 @@ class DOMMediaStream;
 class ErrorResult;
 class MediaResource;
 class MediaDecoder;
-class MediaInputPort;
-class MediaStream;
-class MediaStreamGraph;
 class VideoFrameContainer;
 namespace dom {
 class MediaKeys;
@@ -812,7 +808,13 @@ protected:
 
   MediaDecoderOwner::NextFrameStatus NextFrameStatus();
 
-  void SetDecoder(MediaDecoder* aDecoder);
+  void SetDecoder(MediaDecoder* aDecoder) {
+    MOZ_ASSERT(aDecoder); // Use ShutdownDecoder() to clear.
+    if (mDecoder) {
+      ShutdownDecoder();
+    }
+    mDecoder = aDecoder;
+  }
 
   class WakeLockBoolWrapper {
   public:

dom/html/HTMLVideoElement.h

@@ -11,9 +11,6 @@
 #include "mozilla/dom/HTMLMediaElement.h"
 
 namespace mozilla {
-
-class FrameStatistics;
-
 namespace dom {
 
 class WakeLock;

dom/media/MediaResource.cpp

@@ -33,7 +33,6 @@
 #include <algorithm>
 #include "nsProxyRelease.h"
 #include "nsIContentPolicy.h"
-#include "mozilla/ErrorNames.h"
 
 using mozilla::media::TimeUnit;