From 9d84da20963be17489b1860485f8c32d87e23271 Mon Sep 17 00:00:00 2001
From: alwu <alwu@mozilla.com>
Date: Mon, 9 Nov 2020 15:47:07 +0000
Subject: [PATCH] Bug 1675326 - part1 : move webvtt related files into
 `dom/media/webvtt`. r=bryce

Differential Revision: https://phabricator.services.mozilla.com/D96103
---
 dom/html/HTMLTrackElement.cpp               |  2 +-
 dom/media/moz.build                         | 11 -----------
 dom/media/{ => webvtt}/TextTrack.cpp        |  0
 dom/media/{ => webvtt}/TextTrack.h          |  0
 dom/media/{ => webvtt}/TextTrackCue.cpp     |  2 ++
 dom/media/{ => webvtt}/TextTrackCue.h       |  0
 dom/media/{ => webvtt}/TextTrackCueList.cpp |  0
 dom/media/{ => webvtt}/TextTrackCueList.h   |  0
 dom/media/{ => webvtt}/TextTrackList.cpp    |  0
 dom/media/{ => webvtt}/TextTrackList.h      |  0
 dom/media/{ => webvtt}/TextTrackRegion.cpp  |  0
 dom/media/{ => webvtt}/TextTrackRegion.h    |  0
 dom/media/{ => webvtt}/WebVTTListener.cpp   |  0
 dom/media/{ => webvtt}/WebVTTListener.h     |  0
 dom/media/webvtt/moz.build                  | 20 ++++++++++++++++++++
 15 files changed, 23 insertions(+), 12 deletions(-)
 rename dom/media/{ => webvtt}/TextTrack.cpp (100%)
 rename dom/media/{ => webvtt}/TextTrack.h (100%)
 rename dom/media/{ => webvtt}/TextTrackCue.cpp (99%)
 rename dom/media/{ => webvtt}/TextTrackCue.h (100%)
 rename dom/media/{ => webvtt}/TextTrackCueList.cpp (100%)
 rename dom/media/{ => webvtt}/TextTrackCueList.h (100%)
 rename dom/media/{ => webvtt}/TextTrackList.cpp (100%)
 rename dom/media/{ => webvtt}/TextTrackList.h (100%)
 rename dom/media/{ => webvtt}/TextTrackRegion.cpp (100%)
 rename dom/media/{ => webvtt}/TextTrackRegion.h (100%)
 rename dom/media/{ => webvtt}/WebVTTListener.cpp (100%)
 rename dom/media/{ => webvtt}/WebVTTListener.h (100%)

diff --git a/dom/html/HTMLTrackElement.cpp b/dom/html/HTMLTrackElement.cpp
index ac9dae14d7e6..7d288e7c5c80 100644
--- a/dom/html/HTMLTrackElement.cpp
+++ b/dom/html/HTMLTrackElement.cpp
@@ -7,7 +7,7 @@
 #include "mozilla/dom/HTMLTrackElement.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLMediaElement.h"
-#include "WebVTTListener.h"
+#include "mozilla/dom/WebVTTListener.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/dom/HTMLTrackElementBinding.h"
diff --git a/dom/media/moz.build b/dom/media/moz.build
index 337fc55dc951..f10ab2b2000f 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -215,11 +215,6 @@ EXPORTS.mozilla.dom += [
     "MediaDevices.h",
     "MediaStreamError.h",
     "MediaStreamTrack.h",
-    "TextTrack.h",
-    "TextTrackCue.h",
-    "TextTrackCueList.h",
-    "TextTrackList.h",
-    "TextTrackRegion.h",
     "VideoPlaybackQuality.h",
     "VideoStreamTrack.h",
     "VideoTrack.h",
@@ -289,11 +284,6 @@ UNIFIED_SOURCES += [
     "QueueObject.cpp",
     "ReaderProxy.cpp",
     "SeekJob.cpp",
-    "TextTrack.cpp",
-    "TextTrackCue.cpp",
-    "TextTrackCueList.cpp",
-    "TextTrackList.cpp",
-    "TextTrackRegion.cpp",
     "Tracing.cpp",
     "VideoFrameContainer.cpp",
     "VideoPlaybackQuality.cpp",
@@ -302,7 +292,6 @@ UNIFIED_SOURCES += [
     "VideoTrack.cpp",
     "VideoTrackList.cpp",
     "VideoUtils.cpp",
-    "WebVTTListener.cpp",
     "XiphExtradata.cpp",
 ]
 
diff --git a/dom/media/TextTrack.cpp b/dom/media/webvtt/TextTrack.cpp
similarity index 100%
rename from dom/media/TextTrack.cpp
rename to dom/media/webvtt/TextTrack.cpp
diff --git a/dom/media/TextTrack.h b/dom/media/webvtt/TextTrack.h
similarity index 100%
rename from dom/media/TextTrack.h
rename to dom/media/webvtt/TextTrack.h
diff --git a/dom/media/TextTrackCue.cpp b/dom/media/webvtt/TextTrackCue.cpp
similarity index 99%
rename from dom/media/TextTrackCue.cpp
rename to dom/media/webvtt/TextTrackCue.cpp
index d458f53aefbd..fdeefa59198f 100644
--- a/dom/media/TextTrackCue.cpp
+++ b/dom/media/webvtt/TextTrackCue.cpp
@@ -253,4 +253,6 @@ void TextTrackCue::SetActive(bool aActive) {
   }
 }
 
+#undef LOG
+
 }  // namespace mozilla::dom
diff --git a/dom/media/TextTrackCue.h b/dom/media/webvtt/TextTrackCue.h
similarity index 100%
rename from dom/media/TextTrackCue.h
rename to dom/media/webvtt/TextTrackCue.h
diff --git a/dom/media/TextTrackCueList.cpp b/dom/media/webvtt/TextTrackCueList.cpp
similarity index 100%
rename from dom/media/TextTrackCueList.cpp
rename to dom/media/webvtt/TextTrackCueList.cpp
diff --git a/dom/media/TextTrackCueList.h b/dom/media/webvtt/TextTrackCueList.h
similarity index 100%
rename from dom/media/TextTrackCueList.h
rename to dom/media/webvtt/TextTrackCueList.h
diff --git a/dom/media/TextTrackList.cpp b/dom/media/webvtt/TextTrackList.cpp
similarity index 100%
rename from dom/media/TextTrackList.cpp
rename to dom/media/webvtt/TextTrackList.cpp
diff --git a/dom/media/TextTrackList.h b/dom/media/webvtt/TextTrackList.h
similarity index 100%
rename from dom/media/TextTrackList.h
rename to dom/media/webvtt/TextTrackList.h
diff --git a/dom/media/TextTrackRegion.cpp b/dom/media/webvtt/TextTrackRegion.cpp
similarity index 100%
rename from dom/media/TextTrackRegion.cpp
rename to dom/media/webvtt/TextTrackRegion.cpp
diff --git a/dom/media/TextTrackRegion.h b/dom/media/webvtt/TextTrackRegion.h
similarity index 100%
rename from dom/media/TextTrackRegion.h
rename to dom/media/webvtt/TextTrackRegion.h
diff --git a/dom/media/WebVTTListener.cpp b/dom/media/webvtt/WebVTTListener.cpp
similarity index 100%
rename from dom/media/WebVTTListener.cpp
rename to dom/media/webvtt/WebVTTListener.cpp
diff --git a/dom/media/WebVTTListener.h b/dom/media/webvtt/WebVTTListener.h
similarity index 100%
rename from dom/media/WebVTTListener.h
rename to dom/media/webvtt/WebVTTListener.h
diff --git a/dom/media/webvtt/moz.build b/dom/media/webvtt/moz.build
index 94444f58d370..63018315f34b 100644
--- a/dom/media/webvtt/moz.build
+++ b/dom/media/webvtt/moz.build
@@ -4,6 +4,24 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+EXPORTS.mozilla.dom += [
+    "TextTrack.h",
+    "TextTrackCue.h",
+    "TextTrackCueList.h",
+    "TextTrackList.h",
+    "TextTrackRegion.h",
+    "WebVTTListener.h",
+]
+
+UNIFIED_SOURCES += [
+    "TextTrack.cpp",
+    "TextTrackCue.cpp",
+    "TextTrackCueList.cpp",
+    "TextTrackList.cpp",
+    "TextTrackRegion.cpp",
+    "WebVTTListener.cpp",
+]
+
 XPIDL_SOURCES += [
     "nsIWebVTTListener.idl",
     "nsIWebVTTParserWrapper.idl",
@@ -24,3 +42,5 @@ EXTRA_JS_MODULES += [
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell.ini"]
+
+FINAL_LIBRARY = "xul"