Bug 1846277 - Remove nsGlobalWindow.h. r=dom-core,necko-reviewers,jesup,farre

Differential Revision: https://phabricator.services.mozilla.com/D184973
2023-08-02 20:41:48 +00:00 · 2023-08-02 20:41:48 +00:00 · 9fba1d5220
commit 9fba1d5220
parent d99a46d518
83 changed files with 93 additions and 112 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@ -205,7 +205,8 @@
 #include "nsError.h"
 #include "nsEscape.h"
 #include "nsFocusManager.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsJSEnvironment.h"
 #include "nsNetCID.h"
 #include "nsNetUtil.h"
--- a/dom/animation/AnimationUtils.cpp
+++ b/dom/animation/AnimationUtils.cpp
@ -14,7 +14,7 @@
 #include "nsAtom.h"
 #include "nsIContent.h"
 #include "nsLayoutUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsString.h"
 #include "xpcpublic.h"  // For xpc::NativeGlobal

--- a/dom/audiochannel/AudioChannelService.cpp
+++ b/dom/audiochannel/AudioChannelService.cpp
@ -14,11 +14,11 @@
 #include "mozilla/dom/Document.h"

 #include "nsContentUtils.h"
+#include "nsIObserverService.h"
 #include "nsISupportsPrimitives.h"
 #include "nsThreadUtils.h"
 #include "nsHashPropertyBag.h"
 #include "nsComponentManagerUtils.h"
-#include "nsGlobalWindow.h"
 #include "nsPIDOMWindow.h"
 #include "nsServiceManagerUtils.h"

--- a/dom/base/BarProps.cpp
+++ b/dom/base/BarProps.cpp
@ -8,7 +8,7 @@
 #include "mozilla/dom/BarPropBinding.h"
 #include "nsContentUtils.h"
 #include "nsDocShell.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIWebBrowserChrome.h"

 namespace mozilla::dom {
--- a/dom/base/CustomElementRegistry.cpp
+++ b/dom/base/CustomElementRegistry.cpp
@ -26,11 +26,12 @@
 #include "mozilla/UseCounter.h"
 #include "nsContentUtils.h"
 #include "nsHTMLTags.h"
+#include "nsInterfaceHashtable.h"
+#include "nsPIDOMWindow.h"
 #include "jsapi.h"
 #include "js/ForOfIterator.h"       // JS::ForOfIterator
 #include "js/PropertyAndElement.h"  // JS_GetProperty, JS_GetUCProperty
 #include "xpcprivate.h"
-#include "nsGlobalWindow.h"
 #include "nsNameSpaceManager.h"

 namespace mozilla::dom {
--- a/dom/base/IdleRequest.cpp
+++ b/dom/base/IdleRequest.cpp
@ -12,7 +12,6 @@
 #include "mozilla/dom/TimeoutManager.h"
 #include "mozilla/dom/WindowBinding.h"
 #include "nsComponentManagerUtils.h"
-#include "nsGlobalWindow.h"
 #include "nsPIDOMWindow.h"

 namespace mozilla::dom {
--- a/dom/base/Location.cpp
+++ b/dom/base/Location.cpp
@ -22,7 +22,7 @@
 #include "nsJSUtils.h"
 #include "nsContentUtils.h"
 #include "nsDocShell.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "mozilla/Likely.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/BasePrincipal.h"
--- a/dom/base/LocationBase.cpp
+++ b/dom/base/LocationBase.cpp
@ -13,7 +13,7 @@
 #include "nsCOMPtr.h"
 #include "nsError.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "mozilla/NullPrincipal.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/ReferrerInfo.h"
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@ -64,7 +64,7 @@
 #include "mozilla/StaticPtr.h"
 #include "Connection.h"
 #include "mozilla/dom/Event.h"  // for Event
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIPermissionManager.h"
 #include "nsMimeTypes.h"
 #include "nsNetUtil.h"
@ -1734,7 +1734,7 @@ void Navigator::GetActiveVRDisplays(
   * GetActiveVRDisplays should only enumerate displays that
   * are already active without causing any other hardware to be
   * activated.
-   * We must not call nsGlobalWindow::NotifyHasXRSession here,
+   * We must not call nsGlobalWindowInner::NotifyHasXRSession here,
   * as that would cause enumeration and activation of other VR hardware.
   * Activating VR hardware is intrusive to the end user, as it may
   * involve physically powering on devices that the user did not
--- a/dom/base/ScreenOrientation.cpp
+++ b/dom/base/ScreenOrientation.cpp
@ -7,7 +7,7 @@
 #include "ScreenOrientation.h"
 #include "nsIDocShell.h"
 #include "mozilla/dom/Document.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsSandboxFlags.h"
 #include "nsScreen.h"

--- a/dom/base/TimeoutManager.cpp
+++ b/dom/base/TimeoutManager.cpp
@ -5,7 +5,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "TimeoutManager.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "mozilla/Logging.h"
 #include "mozilla/ProfilerMarkers.h"
 #include "mozilla/ScopeExit.h"
--- a/dom/base/WindowDestroyedEvent.cpp
+++ b/dom/base/WindowDestroyedEvent.cpp
@ -15,6 +15,8 @@
 #include "nsJSPrincipals.h"
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
 #include "xpcpublic.h"
 #include "mozilla/AppShutdown.h"
 #include "mozilla/BasePrincipal.h"
--- a/dom/base/WindowDestroyedEvent.h
+++ b/dom/base/WindowDestroyedEvent.h
@ -7,11 +7,13 @@
 #ifndef WindowDestroyedEvent_h
 #define WindowDestroyedEvent_h

-#include "nsGlobalWindow.h"
 #include "nsIWeakReferenceUtils.h"
 #include "nsString.h"
 #include "nsThreadUtils.h"

+class nsGlobalWindowInner;
+class nsGlobalWindowOuter;
+
 namespace mozilla {

 class WindowDestroyedEvent final : public Runnable {
--- a/dom/base/WindowNamedPropertiesHandler.cpp
+++ b/dom/base/WindowNamedPropertiesHandler.cpp
@ -10,7 +10,8 @@
 #include "mozilla/dom/WindowBinding.h"
 #include "mozilla/dom/WindowProxyHolder.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsHTMLDocument.h"
 #include "nsJSUtils.h"
 #include "xpcprivate.h"
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@ -75,7 +75,6 @@ EXPORTS += [
    "nsFrameLoader.h",  # Because binding headers include it.
    "nsFrameLoaderOwner.h",
    "nsFrameMessageManager.h",
-    "nsGlobalWindow.h",  # Because binding headers include it.
    "nsGlobalWindowInner.h",  # Because binding headers include it.
    "nsGlobalWindowOuter.h",  # Because binding headers include it.
    "nsIAnimationObserver.h",
--- a/dom/base/nsCCUncollectableMarker.cpp
+++ b/dom/base/nsCCUncollectableMarker.cpp
@ -22,7 +22,8 @@
 #include "nsIAppShellService.h"
 #include "nsAppShellCID.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsJSEnvironment.h"
 #include "nsFrameLoader.h"
 #include "mozilla/CycleCollectedJSContext.h"
--- a/dom/base/nsDOMMutationObserver.h
+++ b/dom/base/nsDOMMutationObserver.h
@ -19,7 +19,7 @@
 #include "nsClassHashtable.h"
 #include "nsContentList.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIAnimationObserver.h"
 #include "nsIScriptContext.h"
 #include "nsIVariant.h"
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@ -14,7 +14,8 @@
 #include "nsContentList.h"
 #include "nsError.h"
 #include "nsQueryContentEventResult.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsFocusManager.h"
 #include "nsFrameManager.h"
 #include "nsRefreshDriver.h"
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@ -12,7 +12,6 @@
 #include "ChildIterator.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsGkAtoms.h"
-#include "nsGlobalWindow.h"
 #include "nsContentUtils.h"
 #include "ContentParent.h"
 #include "nsPIDOMWindow.h"
--- a/dom/base/nsFrameLoader.cpp
+++ b/dom/base/nsFrameLoader.cpp
@ -41,7 +41,7 @@
 #include "nsIAppWindow.h"
 #include "nsIMozBrowserFrame.h"
 #include "nsIScriptError.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsHTMLDocument.h"
 #include "nsPIWindowRoot.h"
 #include "nsLayoutUtils.h"
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@ -1,17 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-#ifndef nsGlobalWindow_h___
-#define nsGlobalWindow_h___
-
-// NOTE: This is so that I can rewrite the includes in a separate patch.
-// Specificially I don't think I want to change this until I've moved everything
-// to mozilla/dom/Window.h and mozilla/dom/WindowProxy.h.
-
-#include "nsGlobalWindowInner.h"
-#include "nsGlobalWindowOuter.h"
-
-#endif /* nsGlobalWindow_h___ */
--- a/dom/base/nsGlobalWindowOuter.cpp
+++ b/dom/base/nsGlobalWindowOuter.cpp
@ -6,7 +6,8 @@

 #include "mozilla/Assertions.h"
 #include "mozilla/ScopeExit.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowOuter.h"
+#include "nsGlobalWindowInner.h"

 #include <algorithm>

--- a/dom/base/nsINode.cpp
+++ b/dom/base/nsINode.cpp
@ -103,7 +103,7 @@
 #include "nsWrapperCacheInlines.h"
 #include "WrapperFactory.h"
 #include <algorithm>
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "GeometryUtils.h"
 #include "nsIAnimationObserver.h"
 #include "nsChildContentList.h"
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@ -50,7 +50,8 @@
 #include "nsIArray.h"
 #include "CCGCScheduler.h"
 #include "WrapperFactory.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/PresShell.h"
--- a/dom/base/nsWindowMemoryReporter.cpp
+++ b/dom/base/nsWindowMemoryReporter.cpp
@ -6,7 +6,8 @@

 #include "nsWindowMemoryReporter.h"
 #include "nsWindowSizes.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/ClearOnShutdown.h"
--- a/dom/base/nsWindowMemoryReporter.h
+++ b/dom/base/nsWindowMemoryReporter.h
@ -7,7 +7,7 @@
 #ifndef nsWindowMemoryReporter_h__
 #define nsWindowMemoryReporter_h__

-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIMemoryReporter.h"
 #include "nsIObserver.h"
 #include "nsITimer.h"
--- a/dom/base/nsWindowRoot.cpp
+++ b/dom/base/nsWindowRoot.cpp
@ -19,7 +19,7 @@
 #include "nsFrameLoaderOwner.h"
 #include "nsFrameLoader.h"
 #include "nsQueryActor.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsFocusManager.h"
 #include "nsIContent.h"
 #include "nsIControllers.h"
--- a/dom/bindings/BindingUtils.cpp
+++ b/dom/bindings/BindingUtils.cpp
@ -35,7 +35,7 @@
 #include "jsfriendapi.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsHTMLTags.h"
 #include "nsIDOMGlobalPropertyInitializer.h"
 #include "nsINode.h"
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@ -1578,7 +1578,7 @@ DOMInterfaces = {

 'Window': {
    'nativeType': 'nsGlobalWindowInner',
-    'headerFile': 'nsGlobalWindow.h',
+    'headerFile': 'nsGlobalWindowInner.h',
    'implicitJSContext': [
        'requestIdleCallback', 'indexedDB'
    ],
--- a/dom/bindings/CallbackObject.cpp
+++ b/dom/bindings/CallbackObject.cpp
@ -15,7 +15,7 @@
 #include "xpcprivate.h"
 #include "WorkerPrivate.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "WorkerScope.h"
 #include "jsapi.h"
 #include "js/ContextOptions.h"
--- a/dom/bindings/WebIDLGlobalNameHash.cpp
+++ b/dom/bindings/WebIDLGlobalNameHash.cpp
@ -23,7 +23,7 @@
 #include "mozilla/dom/PrototypeList.h"
 #include "mozilla/dom/ProxyHandlerUtils.h"
 #include "mozilla/dom/RegisterBindings.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsTHashtable.h"
 #include "WrapperFactory.h"

--- a/dom/bindings/nsScriptError.cpp
+++ b/dom/bindings/nsScriptError.cpp
@ -13,7 +13,7 @@
 #include "MainThreadUtils.h"
 #include "mozilla/Assertions.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsNetUtil.h"
 #include "nsPIDOMWindow.h"
 #include "nsIMutableArray.h"
--- a/dom/bindings/nsScriptErrorWithStack.cpp
+++ b/dom/bindings/nsScriptErrorWithStack.cpp
@ -15,8 +15,10 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/ScriptSettings.h"
-#include "nsGlobalWindow.h"
+#include "js/Wrapper.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsGlobalWindowInner.h"
+#include "nsJSUtils.h"

 using namespace mozilla::dom;

--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@ -116,7 +116,7 @@
 #include "mozilla/dom/SVGImageElement.h"
 #include "mozilla/dom/TextMetrics.h"
 #include "mozilla/FloatingPoint.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsDeviceContext.h"
 #include "nsFontMetrics.h"
 #include "nsLayoutUtils.h"
--- a/dom/console/Console.cpp
+++ b/dom/console/Console.cpp
@ -38,7 +38,7 @@
 #include "mozilla/StaticPrefs_dom.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDOMNavigationTiming.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsJSUtils.h"
 #include "nsNetUtil.h"
 #include "xpcpublic.h"
--- a/dom/events/Event.cpp
+++ b/dom/events/Event.cpp
@ -36,7 +36,7 @@
 #include "nsCOMPtr.h"
 #include "nsDeviceContext.h"
 #include "nsError.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIFrame.h"
 #include "nsIContent.h"
 #include "nsIContentInlines.h"
--- a/dom/events/KeyEventHandler.cpp
+++ b/dom/events/KeyEventHandler.cpp
@ -10,7 +10,6 @@
 #include "nsQueryObject.h"
 #include "KeyEventHandler.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
 #include "nsGlobalWindowCommands.h"
 #include "nsIContent.h"
 #include "nsAtom.h"
--- a/dom/events/Touch.cpp
+++ b/dom/events/Touch.cpp
@ -8,7 +8,6 @@

 #include "mozilla/dom/EventTarget.h"
 #include "mozilla/dom/TouchEvent.h"
-#include "nsGlobalWindow.h"
 #include "nsContentUtils.h"
 #include "nsIContent.h"

--- a/dom/gamepad/GamepadManager.cpp
+++ b/dom/gamepad/GamepadManager.cpp
@ -22,7 +22,7 @@
 #include "mozilla/StaticPtr.h"

 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
 #include "nsThreadUtils.h"
--- a/dom/geolocation/Geolocation.cpp
+++ b/dom/geolocation/Geolocation.cpp
@ -23,7 +23,7 @@
 #include "nsComponentManagerUtils.h"
 #include "nsContentPermissionHelper.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "mozilla/dom/Document.h"
 #include "nsINamed.h"
 #include "nsIObserverService.h"
--- a/dom/html/HTMLBodyElement.cpp
+++ b/dom/html/HTMLBodyElement.cpp
@ -21,7 +21,7 @@
 #include "DocumentInlines.h"
 #include "nsDocShell.h"
 #include "nsIDocShell.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"

 NS_IMPL_NS_NEW_HTML_ELEMENT(Body)

--- a/dom/html/HTMLFrameSetElement.cpp
+++ b/dom/html/HTMLFrameSetElement.cpp
@ -8,7 +8,7 @@
 #include "mozilla/dom/HTMLFrameSetElementBinding.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/EventHandlerBinding.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "mozilla/UniquePtrExtensions.h"

 NS_IMPL_NS_NEW_HTML_ELEMENT(FrameSet)
--- a/dom/html/HTMLInputElement.cpp
+++ b/dom/html/HTMLInputElement.cpp
@ -97,7 +97,6 @@
 #include "nsIContentPrefService2.h"
 #include "nsIMIMEService.h"
 #include "nsIObserverService.h"
-#include "nsGlobalWindow.h"

 // input type=image
 #include "nsImageLoadingContent.h"
--- a/dom/html/TextTrackManager.cpp
+++ b/dom/html/TextTrackManager.cpp
@ -17,7 +17,7 @@
 #include "mozilla/dom/TextTrack.h"
 #include "mozilla/dom/TextTrackCue.h"
 #include "nsComponentManagerUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIFrame.h"
 #include "nsIWebVTTParserWrapper.h"
 #include "nsVariant.h"
--- a/dom/html/nsGenericHTMLElement.cpp
+++ b/dom/html/nsGenericHTMLElement.cpp
@ -79,6 +79,7 @@
 #include "mozilla/dom/TouchEvent.h"
 #include "mozilla/ErrorResult.h"
 #include "nsHTMLDocument.h"
+#include "nsGlobalWindowInner.h"
 #include "mozilla/dom/HTMLBodyElement.h"
 #include "imgIContainer.h"
 #include "nsComputedDOMStyle.h"
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@ -11,7 +11,7 @@
 #include "mozilla/StaticPrefs_intl.h"
 #include "nsCommandManager.h"
 #include "nsCOMPtr.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsString.h"
 #include "nsPrintfCString.h"
 #include "nsReadableUtils.h"
--- a/dom/indexedDB/IDBFactory.cpp
+++ b/dom/indexedDB/IDBFactory.cpp
@ -28,7 +28,7 @@
 #include "mozilla/Telemetry.h"
 #include "nsAboutProtocolUtils.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIAboutModule.h"
 #include "nsILoadContext.h"
 #include "nsIURI.h"
--- a/dom/indexedDB/IndexedDatabaseManager.cpp
+++ b/dom/indexedDB/IndexedDatabaseManager.cpp
@ -29,7 +29,6 @@
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/PBackgroundChild.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
 #include "mozilla/Logging.h"

 #include "ActorsChild.h"
--- a/dom/ipc/BrowserChild.cpp
+++ b/dom/ipc/BrowserChild.cpp
@ -105,7 +105,7 @@
 #include "nsExceptionHandler.h"
 #include "nsFilePickerProxy.h"
 #include "nsFocusManager.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsIBaseWindow.h"
 #include "nsIBrowserDOMWindow.h"
 #include "nsIClassifiedChannel.h"
@ -462,7 +462,7 @@ nsresult BrowserChild::Init(mozIDOMWindowProxy* aParent,
 #endif  // defined(DEBUG)

  // Few lines before, baseWindow->Create() will end up creating a new
-  // window root in nsGlobalWindow::SetDocShell.
+  // window root in nsGlobalWindowOuter::SetDocShell.
  // Then this chrome event handler, will be inherited to inner windows.
  // We want to also set it to the docshell so that inner windows
  // and any code that has access to the docshell
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@ -47,7 +47,8 @@
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsArray.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsHashPropertyBag.h"
 #include "nsIEventTarget.h"
 #include "nsIPermissionManager.h"
@ -55,7 +56,6 @@
 #include "nsJSUtils.h"
 #include "nsNetCID.h"
 #include "nsNetUtil.h"
-#include "nsPIDOMWindow.h"
 #include "nsProxyRelease.h"
 #include "nspr.h"
 #include "nss.h"
--- a/dom/media/systemservices/MediaChild.cpp
+++ b/dom/media/systemservices/MediaChild.cpp
@ -6,8 +6,6 @@

 #include "MediaChild.h"
 #include "MediaParent.h"
-
-#include "nsGlobalWindow.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/MediaManager.h"
 #include "mozilla/Logging.h"
--- a/dom/media/systemservices/moz.build
+++ b/dom/media/systemservices/moz.build
@ -103,10 +103,6 @@ IPDL_SOURCES += [
    "PMedia.ipdl",
    "PMediaSystemResourceManager.ipdl",
 ]
-# /dom/base needed for nsGlobalWindow.h in MediaChild.cpp
-LOCAL_INCLUDES += [
-    "/dom/base",
-]

 include("/ipc/chromium/chromium-config.mozbuild")

--- a/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp
+++ b/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp
@ -61,7 +61,7 @@
 #endif  // XP_WIN

 #include "mozilla/dom/Document.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsDOMDataChannel.h"
 #include "mozilla/dom/Location.h"
 #include "mozilla/dom/Promise.h"
--- a/dom/media/webvtt/TextTrack.cpp
+++ b/dom/media/webvtt/TextTrack.cpp
@ -13,7 +13,7 @@
 #include "mozilla/dom/TextTrackRegion.h"
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/dom/HTMLTrackElement.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"

 extern mozilla::LazyLogModule gTextTrackLog;

--- a/dom/media/webvtt/TextTrackList.cpp
+++ b/dom/media/webvtt/TextTrackList.cpp
@ -10,7 +10,7 @@
 #include "mozilla/dom/TextTrackListBinding.h"
 #include "mozilla/dom/TrackEvent.h"
 #include "nsThreadUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "mozilla/dom/TextTrackCue.h"
 #include "mozilla/dom/TextTrackManager.h"

--- a/dom/messagechannel/MessagePort.cpp
+++ b/dom/messagechannel/MessagePort.cpp
@ -32,7 +32,6 @@
 #include "mozilla/TimelineMarker.h"
 #include "mozilla/Unused.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
 #include "nsPresContext.h"

 #ifdef XP_WIN
--- a/dom/notification/Notification.cpp
+++ b/dom/notification/Notification.cpp
@ -41,7 +41,6 @@
 #include "nsContentUtils.h"
 #include "nsDOMJSUtils.h"
 #include "nsFocusManager.h"
-#include "nsGlobalWindow.h"
 #include "nsIAlertsService.h"
 #include "nsIContentPermissionPrompt.h"
 #include "nsILoadContext.h"
--- a/dom/promise/Promise.cpp
+++ b/dom/promise/Promise.cpp
@ -40,7 +40,7 @@
 #include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDebug.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsJSEnvironment.h"
 #include "nsJSPrincipals.h"
--- a/dom/smil/TimeEvent.cpp
+++ b/dom/smil/TimeEvent.cpp
@ -9,7 +9,8 @@
 #include "nsIDocShell.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsPresContext.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"

 namespace mozilla::dom {

--- a/dom/vr/VREventObserver.cpp
+++ b/dom/vr/VREventObserver.cpp
@ -7,7 +7,7 @@
 #include "VREventObserver.h"

 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"

 #include "mozilla/Telemetry.h"

@ -16,9 +16,10 @@ namespace mozilla::dom {
 using namespace gfx;

 /**
- * This class is used by nsGlobalWindow to implement window.onvrdisplayactivate,
- * window.onvrdisplaydeactivate, window.onvrdisplayconnected,
- * window.onvrdisplaydisconnected, and window.onvrdisplaypresentchange.
+ * This class is used by nsGlobalWindowInner to implement
+ * window.onvrdisplayactivate, window.onvrdisplaydeactivate,
+ * window.onvrdisplayconnected, window.onvrdisplaydisconnected, and
+ * window.onvrdisplaypresentchange.
 */
 VREventObserver::VREventObserver(nsGlobalWindowInner* aGlobalWindow)
    : mWindow(aGlobalWindow),
@ -37,7 +38,7 @@ VREventObserver::VREventObserver(nsGlobalWindowInner* aGlobalWindow)
 VREventObserver::~VREventObserver() { DisconnectFromOwner(); }

 void VREventObserver::DisconnectFromOwner() {
-  // In the event that nsGlobalWindow is deallocated, VREventObserver may
+  // In the event that nsGlobalWindowInner is deallocated, VREventObserver may
  // still be AddRef'ed elsewhere.  Ensure that we don't UAF by
  // dereferencing mWindow.
  UpdateSpentTimeIn2DTelemetry(true);
@ -124,8 +125,8 @@ void VREventObserver::NotifyVRDisplayUnmounted(uint32_t aDisplayID) {

 void VREventObserver::NotifyVRDisplayConnect(uint32_t aDisplayID) {
  /**
-   * We do not call nsGlobalWindow::NotifyActiveVRDisplaysChanged here, as we
-   * can assume that a newly enumerated display is not presenting WebVR
+   * We do not call nsGlobalWindowInner::NotifyActiveVRDisplaysChanged here, as
+   * we can assume that a newly enumerated display is not presenting WebVR
   * content.
   */
  if (mWindow && mWindow->IsCurrentInnerWindow() && IsWebVR(aDisplayID)) {
--- a/dom/vr/XRSession.cpp
+++ b/dom/vr/XRSession.cpp
@ -24,7 +24,7 @@
 #include "XRViewerPose.h"
 #include "VRLayerChild.h"
 #include "XRInputSourceArray.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIObserverService.h"
 #include "nsISupportsPrimitives.h"
 #include "nsRefreshDriver.h"
--- a/dom/vr/XRSystem.cpp
+++ b/dom/vr/XRSystem.cpp
@ -14,7 +14,7 @@
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/FeaturePolicyUtils.h"
 #include "mozilla/dom/PermissionMessageUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsThreadUtils.h"
 #include "gfxVR.h"
 #include "VRDisplayClient.h"
--- a/dom/websocket/WebSocket.cpp
+++ b/dom/websocket/WebSocket.cpp
@ -30,7 +30,7 @@
 #include "mozilla/dom/WorkerScope.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/LoadInfo.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIScriptGlobalObject.h"
 #include "mozilla/dom/Document.h"
 #include "nsXPCOM.h"
--- a/gfx/vr/ipc/VRManagerChild.cpp
+++ b/gfx/vr/ipc/VRManagerChild.cpp
@ -10,7 +10,7 @@
 #include "VRManagerParent.h"
 #include "VRThread.h"
 #include "VRDisplayClient.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "mozilla/ProfilerMarkers.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/layers/CompositorThread.h"  // for CompositorThread
--- a/js/xpconnect/src/ExportHelpers.cpp
+++ b/js/xpconnect/src/ExportHelpers.cpp
@ -21,7 +21,6 @@
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/StructuredCloneHolder.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
 #include "nsJSUtils.h"
 #include "js/Object.h"  // JS::GetCompartment

--- a/js/xpconnect/src/Sandbox.cpp
+++ b/js/xpconnect/src/Sandbox.cpp
@ -22,7 +22,7 @@
 #include "js/SourceText.h"
 #include "js/StructuredClone.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIException.h"  // for nsIStackFrame
 #include "nsIScriptContext.h"
 #include "nsIScriptObjectPrincipal.h"
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@ -46,7 +46,7 @@
 #include "nsIException.h"
 #include "nsIScriptError.h"
 #include "nsPIDOMWindow.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsScriptError.h"
 #include "GeckoProfiler.h"
 #include "ProfilerControl.h"
--- a/js/xpconnect/src/XPCJSContext.cpp
+++ b/js/xpconnect/src/XPCJSContext.cpp
@ -63,7 +63,7 @@
 #include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/Unused.h"
 #include "AccessCheck.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsAboutProtocolUtils.h"

 #include "GeckoProfiler.h"
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@ -74,7 +74,7 @@
 #include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/Unused.h"
 #include "AccessCheck.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsAboutProtocolUtils.h"

 #include "NodeUbiReporting.h"
--- a/js/xpconnect/wrappers/AccessCheck.cpp
+++ b/js/xpconnect/wrappers/AccessCheck.cpp
@ -7,7 +7,7 @@
 #include "AccessCheck.h"

 #include "nsJSPrincipals.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"

 #include "XPCWrapper.h"
 #include "XrayWrapper.h"
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@ -78,7 +78,7 @@
 #include "nsIClipboardHelper.h"

 #include "nsPIDOMWindow.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsDOMNavigationTiming.h"
 #include "nsPIWindowRoot.h"
 #include "nsJSEnvironment.h"
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@ -26,7 +26,8 @@
 #include "mozilla/dom/PopupBlocker.h"
 #include "nsIFrame.h"
 #include "nsFrameState.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsGkAtoms.h"
 #include "nsImageFrame.h"
 #include "mozilla/GlobalStyleSheetCache.h"
--- a/layout/style/CSS.cpp
+++ b/layout/style/CSS.cpp
@ -11,7 +11,6 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/HighlightRegistry.h"
 #include "mozilla/ServoBindings.h"
-#include "nsGlobalWindow.h"
 #include "mozilla/dom/Document.h"
 #include "nsStyleUtil.h"
 #include "xpcpublic.h"
--- a/layout/xul/nsXULPopupManager.cpp
+++ b/layout/xul/nsXULPopupManager.cpp
@ -17,7 +17,7 @@
 #include "nsXULElement.h"
 #include "nsIDOMXULCommandDispatcher.h"
 #include "nsCSSFrameConstructor.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsIContentInlines.h"
 #include "nsLayoutUtils.h"
 #include "nsViewManager.h"
--- a/netwerk/base/LoadInfo.cpp
+++ b/netwerk/base/LoadInfo.cpp
@ -39,7 +39,8 @@
 #include "nsISupportsUtils.h"
 #include "nsIXPConnect.h"
 #include "nsDocShell.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsMixedContentBlocker.h"
 #include "nsQueryObject.h"
 #include "nsRedirectHistoryEntry.h"
--- a/netwerk/ipc/NeckoChild.cpp
+++ b/netwerk/ipc/NeckoChild.cpp
@ -32,7 +32,7 @@
 #endif

 #include "SerializedLoadContext.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIOService.h"
 #include "nsINetworkPredictor.h"
 #include "nsINetworkPredictorVerifier.h"
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@ -31,7 +31,6 @@
 #include "nsCOMPtr.h"
 #include "nsContentPolicyUtils.h"
 #include "nsDOMNavigationTiming.h"
-#include "nsGlobalWindow.h"
 #include "nsStringStream.h"
 #include "nsHttpChannel.h"
 #include "nsHttpHandler.h"
--- a/security/manager/ssl/nsSecureBrowserUI.cpp
+++ b/security/manager/ssl/nsSecureBrowserUI.cpp
@ -13,7 +13,7 @@
 #include "nsIChannel.h"
 #include "nsDocShell.h"
 #include "nsIDocShellTreeItem.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsITransportSecurityInfo.h"
 #include "nsIWebProgress.h"
--- a/toolkit/components/windowwatcher/nsWindowWatcher.cpp
+++ b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
@ -17,7 +17,7 @@
 #include "nsJSUtils.h"

 #include "nsDocShell.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsHashPropertyBag.h"
 #include "nsIBaseWindow.h"
 #include "nsIBrowserDOMWindow.h"
@ -73,7 +73,6 @@
 #include "mozilla/dom/SessionStorageManager.h"
 #include "nsIAppWindow.h"
 #include "nsIXULBrowserWindow.h"
-#include "nsGlobalWindow.h"
 #include "ReferrerInfo.h"

 using namespace mozilla;
--- a/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp
+++ b/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp
@ -13,7 +13,7 @@

 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_extensions.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 #include "xpcpublic.h"

 #include "nsIDocShell.h"
--- a/uriloader/base/nsDocLoader.cpp
+++ b/uriloader/base/nsDocLoader.cpp
@ -29,7 +29,6 @@
 #include "nsQueryObject.h"

 #include "nsPIDOMWindow.h"
-#include "nsGlobalWindow.h"

 #include "nsIStringBundle.h"

@ -39,7 +38,6 @@
 #include "nsPresContext.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "nsIBrowserDOMWindow.h"
-#include "nsGlobalWindow.h"
 #include "mozilla/ThrottledEventQueue.h"
 using namespace mozilla;
 using mozilla::DebugOnly;
--- a/xpfe/appshell/AppWindow.cpp
+++ b/xpfe/appshell/AppWindow.cpp
@ -45,7 +45,6 @@
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
 #include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
 #include "nsXULTooltipListener.h"
 #include "nsXULPopupManager.h"
 #include "nsFocusManager.h"
--- a/xpfe/appshell/nsWindowMediator.cpp
+++ b/xpfe/appshell/nsWindowMediator.cpp
@ -16,7 +16,8 @@
 #include "nsAppShellWindowEnumerator.h"
 #include "nsWindowMediator.h"
 #include "nsIWindowMediatorListener.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsServiceManagerUtils.h"

 #include "nsIDocShell.h"