Merge pull request 'Fix some deprots in js' (#2156) from jobbautista9/UXP:deprot-hunt2 into master

Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2156

13 files changed, 31 insertions, 11 deletions

diff --git a/js/ipc/CPOWTimer.cpp b/js/ipc/CPOWTimer.cpp
index ad39c3d32e..e84f04e79f 100644
--- a/js/ipc/CPOWTimer.cpp
+++ b/js/ipc/CPOWTimer.cpp
@@ -10,16 +10,6 @@
 
 #include "jsapi.h"
 
-CPOWTimer::CPOWTimer(JSContext* cx MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL)
-    : cx_(nullptr)
-    , startInterval_(0)
-{
-    MOZ_GUARD_OBJECT_NOTIFIER_INIT;
-    if (!js::GetStopwatchIsMonitoringCPOW(cx))
-        return;
-    cx_ = cx;
-    startInterval_ = JS_Now();
-}
 CPOWTimer::~CPOWTimer()
 {
     if (!cx_) {
diff --git a/js/ipc/CPOWTimer.h b/js/ipc/CPOWTimer.h
index 173f87b107..2755ee14ad 100644
--- a/js/ipc/CPOWTimer.h
+++ b/js/ipc/CPOWTimer.h
@@ -21,7 +21,16 @@
  */
 class MOZ_RAII CPOWTimer final {
   public:
-    explicit inline CPOWTimer(JSContext* cx MOZ_GUARD_OBJECT_NOTIFIER_PARAM);
+    explicit inline
+    CPOWTimer(JSContext* cx MOZ_GUARD_OBJECT_NOTIFIER_PARAM) : cx_(nullptr)
+                                                             , startInterval_(0)
+    {
+        MOZ_GUARD_OBJECT_NOTIFIER_INIT;
+        if (!js::GetStopwatchIsMonitoringCPOW(cx))
+            return;
+        cx_ = cx;
+        startInterval_ = JS_Now();
+    }
     ~CPOWTimer();
 
   private:
diff --git a/js/ipc/JavaScriptShared.cpp b/js/ipc/JavaScriptShared.cpp
index 6dfb00bc5e..60ea1b8d12 100644
--- a/js/ipc/JavaScriptShared.cpp
+++ b/js/ipc/JavaScriptShared.cpp
@@ -5,6 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "JavaScriptShared.h"
+#include "JavaScriptChild.h"
+#include "JavaScriptParent.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/CPOWManagerGetter.h"
 #include "mozilla/dom/TabChild.h"
@@ -16,6 +18,7 @@
 using namespace js;
 using namespace JS;
 using namespace mozilla;
+using namespace mozilla::dom;
 using namespace mozilla::jsipc;
 
 IdToObjectMap::IdToObjectMap()
diff --git a/js/ipc/WrapperOwner.cpp b/js/ipc/WrapperOwner.cpp
index 92c6e409be..2c16269adc 100644
--- a/js/ipc/WrapperOwner.cpp
+++ b/js/ipc/WrapperOwner.cpp
@@ -8,6 +8,7 @@
 #include "JavaScriptLogging.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/BindingUtils.h"
+#include "GeckoProfiler.h"
 #include "jsfriendapi.h"
 #include "js/CharacterEncoding.h"
 #include "xpcprivate.h"
@@ -20,6 +21,7 @@
 using namespace js;
 using namespace JS;
 using namespace mozilla;
+using namespace mozilla::dom;
 using namespace mozilla::jsipc;
 
 struct AuxCPOWData
diff --git a/js/src/builtin/intl/RelativeTimeFormat.cpp b/js/src/builtin/intl/RelativeTimeFormat.cpp
index 234de3d2a4..9bc2258eea 100644
--- a/js/src/builtin/intl/RelativeTimeFormat.cpp
+++ b/js/src/builtin/intl/RelativeTimeFormat.cpp
@@ -29,6 +29,7 @@ using mozilla::RangedPtr;
 using js::intl::CallICU;

 using js::intl::GetAvailableLocales;

 using js::intl::IcuLocale;

+using js::intl::INITIAL_CHAR_BUFFER_SIZE;

 using js::intl::StringsAreEqual;

 

 /**************** RelativeTimeFormat *****************/

diff --git a/js/xpconnect/public/xpc_map_end.h b/js/xpconnect/public/xpc_map_end.h
index 4e34267d7f..3186da8787 100644
--- a/js/xpconnect/public/xpc_map_end.h
+++ b/js/xpconnect/public/xpc_map_end.h
@@ -15,6 +15,7 @@
 #endif
 
 #include "js/Id.h"
+#include "xpc_make_class.h"
 
 /**************************************************************/
 
diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp
index 6888dee376..a34870269a 100644
--- a/js/xpconnect/src/Sandbox.cpp
+++ b/js/xpconnect/src/Sandbox.cpp
@@ -54,8 +54,12 @@ using namespace mozilla;
 using namespace JS;
 using namespace xpc;
 
+using mozilla::dom::ConvertExceptionToPromise;
 using mozilla::dom::DestroyProtoAndIfaceCache;
 using mozilla::dom::IndexedDatabaseManager;
+using mozilla::dom::RequestOrUSVString;
+using mozilla::dom::RequestOrUSVStringArgument;
+using mozilla::dom::RootedDictionary;
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(SandboxPrivate)
 
diff --git a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp
index 551bfb681f..8ecc14b650 100644
--- a/js/xpconnect/src/XPCJSContext.cpp
+++ b/js/xpconnect/src/XPCJSContext.cpp
@@ -22,6 +22,7 @@
 #include "nsIObserverService.h"
 #include "nsIDebug2.h"
 #include "nsIDocShell.h"
+#include "nsIInputStream.h"
 #include "nsIRunnable.h"
 #include "amIAddonManager.h"
 #include "nsPIDOMWindow.h"
@@ -40,6 +41,7 @@
 #include "mozilla/dom/GeneratedAtomList.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/dom/Promise.h"
 #include "mozilla/dom/ScriptLoader.h"
 #include "mozilla/dom/WindowBinding.h"
 #include "mozilla/jsipc/CrossProcessObjectWrappers.h"
@@ -71,6 +73,7 @@
 #endif
 
 using namespace mozilla;
+using namespace mozilla::dom;
 using namespace xpc;
 using namespace JS;
 using mozilla::dom::PerThreadAtomCache;
diff --git a/js/xpconnect/src/XPCJSID.cpp b/js/xpconnect/src/XPCJSID.cpp
index 2bf3939bf1..14525f115b 100644
--- a/js/xpconnect/src/XPCJSID.cpp
+++ b/js/xpconnect/src/XPCJSID.cpp
@@ -11,6 +11,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/jsipc/CrossProcessObjectWrappers.h"
 #include "mozilla/StaticPtr.h"
+#include "nsContentUtils.h"
 
 using namespace mozilla::dom;
 using namespace JS;
diff --git a/js/xpconnect/src/XPCLocale.cpp b/js/xpconnect/src/XPCLocale.cpp
index 9a55c0ec82..8920dbd922 100644
--- a/js/xpconnect/src/XPCLocale.cpp
+++ b/js/xpconnect/src/XPCLocale.cpp
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/Assertions.h"
+#include "mozilla/Preferences.h"
 
 #include "jsapi.h"
 
@@ -23,6 +24,7 @@
 
 using namespace JS;
 using mozilla::dom::EncodingUtils;
+using mozilla::Preferences;
 
 /**
  * JS locale callbacks implemented by XPCOM modules.  These are theoretically
diff --git a/js/xpconnect/src/XPCWrappedNativeInfo.cpp b/js/xpconnect/src/XPCWrappedNativeInfo.cpp
index a93b006f0f..13cffa5161 100644
--- a/js/xpconnect/src/XPCWrappedNativeInfo.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeInfo.cpp
@@ -10,7 +10,9 @@
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/XPTInterfaceInfoManager.h"
+#include "nsAppRunner.h"
 #include "nsIScriptError.h"
+#include "nsJSUtils.h"
 #include "nsPrintfCString.h"
 
 using namespace JS;
diff --git a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
index 6c343e1e8f..ece0cf5076 100644
--- a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
@@ -10,6 +10,7 @@
 #include "jsprf.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/Preferences.h"
+#include "nsContentUtils.h"
 #include "nsIAddonInterposition.h"
 #include "AddonWrapper.h"
 #include "js/Class.h"
diff --git a/js/xpconnect/src/XPCWrappedNativeScope.cpp b/js/xpconnect/src/XPCWrappedNativeScope.cpp
index 4f4e9e7404..d2008e2f8a 100644
--- a/js/xpconnect/src/XPCWrappedNativeScope.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeScope.cpp
@@ -7,6 +7,7 @@
 
 #include "xpcprivate.h"
 #include "XPCWrapper.h"
+#include "AccessCheck.h"
 #include "nsContentUtils.h"
 #include "nsCycleCollectionNoteRootCallback.h"
 #include "nsPrincipal.h"