Bug 1683540 - Make extensions buildable outside of unified-build …

…environment. r=sg Differential Revision: https://phabricator.services.mozilla.com/D100208
dothq · Jan 4, 2021 · 8f28b5c · 8f28b5c
1 parent b6b336c
commit 8f28b5c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/build/non-unified-compat b/build/non-unified-compat
@@ -83,3 +83,8 @@ editor/libeditor/
 editor/reftests/
 editor/spellchecker/
 editor/txmgr/
+extensions/auth/
+extensions/permissions/
+extensions/pref/
+extensions/spellcheck/
+extensions/universalchardet/
diff --git a/extensions/permissions/PermissionManager.cpp b/extensions/permissions/PermissionManager.cpp
@@ -25,6 +25,7 @@
 #include "mozStorageCID.h"
 
 #include "nsAppDirectoryServiceDefs.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "nsCRT.h"
 #include "nsEffectiveTLDService.h"

diff --git a/extensions/pref/autoconfig/src/nsReadConfig.cpp b/extensions/pref/autoconfig/src/nsReadConfig.cpp
@@ -6,12 +6,15 @@
 #include "nsReadConfig.h"
 #include "nsJSConfigTriggers.h"
 
+#include "mozilla/Logging.h"
 #include "mozilla/Components.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsIAppStartup.h"
+#include "nsIChannel.h"
 #include "nsContentUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsIFile.h"
+#include "nsIInputStream.h"
 #include "nsIObserverService.h"
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"

diff --git a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
@@ -219,7 +219,7 @@ nsresult mozInlineSpellWordUtil::SetPositionAndEnd(nsINode* aPositionNode,
       return NS_ERROR_FAILURE;
     }
 
-    if (ShadowRoot::FromNode(rootNode)) {
+    if (mozilla::dom::ShadowRoot::FromNode(rootNode)) {
       mRootNode = rootNode;
     }
   }

diff --git a/extensions/spellcheck/src/mozSpellChecker.cpp b/extensions/spellcheck/src/mozSpellChecker.cpp
@@ -113,7 +113,7 @@ nsresult mozSpellChecker::NextMisspelledWord(nsAString& aWord,
   return NS_OK;
 }
 
-RefPtr<CheckWordPromise> mozSpellChecker::CheckWords(
+RefPtr<mozilla::CheckWordPromise> mozSpellChecker::CheckWords(
     const nsTArray<nsString>& aWords) {
   if (XRE_IsContentProcess()) {
     return mEngine->CheckWords(aWords);
@@ -125,11 +125,12 @@ RefPtr<CheckWordPromise> mozSpellChecker::CheckWords(
     bool misspelled;
     nsresult rv = CheckWord(word, &misspelled, nullptr);
     if (NS_WARN_IF(NS_FAILED(rv))) {
-      return CheckWordPromise::CreateAndReject(rv, __func__);
+      return mozilla::CheckWordPromise::CreateAndReject(rv, __func__);
     }
     misspells.AppendElement(misspelled);
   }
-  return CheckWordPromise::CreateAndResolve(std::move(misspells), __func__);
+  return mozilla::CheckWordPromise::CreateAndResolve(std::move(misspells),
+                                                     __func__);
 }
 
 nsresult mozSpellChecker::CheckWord(const nsAString& aWord, bool* aIsMisspelled,