Bug 1694161 - some fixes for the MacOS non unified environment. r=sg

Differential Revision: https://phabricator.services.mozilla.com/D106616

dom/gamepad/GamepadRemapping.cpp

@@ -14,6 +14,9 @@
 #include "mozilla/dom/GamepadRemapping.h"
 #include "mozilla/dom/GamepadPlatformService.h"
 
+#include <vector>
+#include <unordered_map>
+
 namespace mozilla::dom {
 
 // Follow the canonical ordering recommendation for the "Standard Gamepad"

dom/gamepad/cocoa/CocoaGamepad.cpp

@@ -9,7 +9,11 @@
 
 #include "mozilla/dom/GamepadHandle.h"
 #include "mozilla/dom/GamepadPlatformService.h"
+#include "mozilla/dom/GamepadRemapping.h"
+#include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/Tainting.h"
+#include "nsComponentManagerUtils.h"
 #include "nsITimer.h"
 #include "nsThreadUtils.h"
 #include <CoreFoundation/CoreFoundation.h>
@@ -605,7 +609,7 @@ namespace mozilla {
 namespace dom {
 
 void StartGamepadMonitoring() {
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
   if (gService) {
     return;
   }
@@ -615,7 +619,7 @@ void StartGamepadMonitoring() {
 }
 
 void StopGamepadMonitoring() {
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
   if (!gService) {
     return;
   }

dom/plugins/base/nsPluginTags.cpp

@@ -16,6 +16,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/Unused.h"
 #include "nsNetUtil.h"
+#include "prenv.h"
 #include <cctype>
 #include "mozilla/Encoding.h"
 #include "mozilla/dom/FakePluginTagInitBinding.h"

dom/plugins/ipc/PluginInstanceParent.cpp

@@ -8,6 +8,7 @@
 #include <stdint.h>  // for intptr_t
 
 #include "mozilla/BasicEvents.h"
+#include "mozilla/D3DMessageUtils.h"  // for DxgiAdapterDesc
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/Telemetry.h"

gfx/2d/NativeFontResourceMac.cpp

@@ -4,6 +4,7 @@
  * 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/. */
 
+#include <unordered_map>
 #include <unordered_set>
 #include "NativeFontResourceMac.h"
 #include "UnscaledFontMac.h"

gfx/layers/BufferTexture.cpp

@@ -17,6 +17,8 @@
 #include "mozilla/layers/ImageDataSerializer.h"
 #include "mozilla/layers/TextureForwarder.h"
 
+#include "gfxPlatform.h"
+
 #ifdef MOZ_WIDGET_GTK
 #  include "gfxPlatformGtk.h"
 #endif

gfx/layers/TextureSync.cpp

@@ -14,6 +14,7 @@
 #include "mozilla/layers/CompositorThread.h"
 #include "mozilla/StaticMonitor.h"
 #include "mozilla/StaticPtr.h"
+#include "nsThreadUtils.h"
 
 #ifdef DEBUG
 #  define LOG_ERROR(str, args...)                                  \

gfx/layers/composite/ImageComposite.cpp

@@ -10,6 +10,7 @@
 
 #include "GeckoProfiler.h"
 #include "gfxPlatform.h"
+#include "nsPrintfCString.h"
 
 namespace mozilla {
 

gfx/layers/ipc/ContentCompositorBridgeParent.cpp

@@ -36,6 +36,7 @@
 #include "nsTArray.h"          // for nsTArray
 #include "nsXULAppAPI.h"       // for XRE_GetIOMessageLoop
 #include "mozilla/Unused.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Telemetry.h"
 #ifdef MOZ_GECKO_PROFILER

gfx/webrender_bindings/RenderCompositorLayersSWGL.h

@@ -7,6 +7,8 @@
 #ifndef MOZILLA_GFX_RENDERCOMPOSITOR_Layers_H
 #define MOZILLA_GFX_RENDERCOMPOSITOR_Layers_H
 
+#include <unordered_map>
+
 #include "mozilla/HashFunctions.h"
 #include "mozilla/layers/Compositor.h"
 #include "mozilla/layers/ScreenshotGrabber.h"