Issue mcp-graveyard/UXP%80 - Re-land early dom/media de-unification with fixups.

For some reason these changes never got merged back to master
after reverting to work on a branch...

3 files changed, 19 insertions, 19 deletions

diff --git a/dom/media/imagecapture/CaptureTask.cpp b/dom/media/imagecapture/CaptureTask.cpp
index 589ba5a42..9f1eea9ef 100644
--- a/dom/media/imagecapture/CaptureTask.cpp
+++ b/dom/media/imagecapture/CaptureTask.cpp
@@ -15,24 +15,6 @@
 
 namespace mozilla {
 
-class CaptureTask::MediaStreamEventListener : public MediaStreamTrackListener
-{
-public:
-  explicit MediaStreamEventListener(CaptureTask* aCaptureTask)
-    : mCaptureTask(aCaptureTask) {};
-
-  // MediaStreamListener methods.
-  void NotifyEnded() override
-  {
-    if(!mCaptureTask->mImageGrabbedOrTrackEnd) {
-      mCaptureTask->PostTrackEndEvent();
-    }
-  }
-
-private:
-  CaptureTask* mCaptureTask;
-};
-
 CaptureTask::CaptureTask(dom::ImageCapture* aImageCapture)
   : mImageCapture(aImageCapture)
   , mEventListener(new MediaStreamEventListener(this))
diff --git a/dom/media/imagecapture/CaptureTask.h b/dom/media/imagecapture/CaptureTask.h
index 2b4f0a04c..f9c810158 100644
--- a/dom/media/imagecapture/CaptureTask.h
+++ b/dom/media/imagecapture/CaptureTask.h
@@ -86,6 +86,24 @@ protected:
   bool mPrincipalChanged;
 };
 
+class CaptureTask::MediaStreamEventListener : public MediaStreamTrackListener
+{
+public:
+  explicit MediaStreamEventListener(CaptureTask* aCaptureTask)
+    : mCaptureTask(aCaptureTask) {};
+
+  // MediaStreamListener methods.
+  void NotifyEnded() override
+  {
+    if(!mCaptureTask->mImageGrabbedOrTrackEnd) {
+      mCaptureTask->PostTrackEndEvent();
+    }
+  }
+
+private:
+  CaptureTask* mCaptureTask;
+};
+
 } // namespace mozilla
 
 #endif // CAPTURETASK_H
diff --git a/dom/media/imagecapture/moz.build b/dom/media/imagecapture/moz.build
index f47649c5e..c1a58ff37 100644
--- a/dom/media/imagecapture/moz.build
+++ b/dom/media/imagecapture/moz.build
@@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [
     'ImageCapture.h'
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'CaptureTask.cpp',
     'ImageCapture.cpp',
 ]