diff --git a/build/non-unified-compat b/build/non-unified-compat index 77aa52124318..9ab7e8e8a382 100644 --- a/build/non-unified-compat +++ b/build/non-unified-compat @@ -1,3 +1,7 @@ +docshell/base/ +docshell/build/ +docshell/resources/ +docshell/shistory/ dom/abort/ dom/animation/ dom/audiochannel/ diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp index 5a056f5ab8ff..78e8c450c1c1 100644 --- a/docshell/base/CanonicalBrowsingContext.cpp +++ b/docshell/base/CanonicalBrowsingContext.cpp @@ -31,6 +31,7 @@ #include "nsFrameLoaderOwner.h" #include "nsGlobalWindowOuter.h" #include "nsIWebBrowserChrome.h" +#include "nsIXULRuntime.h" #include "nsNetUtil.h" #include "nsSHistory.h" #include "nsSecureBrowserUI.h" diff --git a/docshell/base/ChildProcessChannelListener.cpp b/docshell/base/ChildProcessChannelListener.cpp index e221c49841ab..3580127f6a6d 100644 --- a/docshell/base/ChildProcessChannelListener.cpp +++ b/docshell/base/ChildProcessChannelListener.cpp @@ -6,6 +6,7 @@ #include "mozilla/dom/ChildProcessChannelListener.h" +#include "mozilla/ipc/Endpoint.h" #include "nsDocShellLoadState.h" namespace mozilla { diff --git a/docshell/base/LoadContext.cpp b/docshell/base/LoadContext.cpp index b626a7884bc1..e90ad77f80a6 100644 --- a/docshell/base/LoadContext.cpp +++ b/docshell/base/LoadContext.cpp @@ -6,6 +6,7 @@ #include "mozilla/Assertions.h" #include "mozilla/BasePrincipal.h" +#include "mozilla/dom/ToJSValue.h" #include "mozilla/LoadContext.h" #include "mozilla/Preferences.h" #include "mozilla/dom/Element.h" diff --git a/docshell/base/WindowContext.cpp b/docshell/base/WindowContext.cpp index 238f46ae3b3c..042eb2fb1d53 100644 --- a/docshell/base/WindowContext.cpp +++ b/docshell/base/WindowContext.cpp @@ -11,6 +11,7 @@ #include "mozilla/dom/SyncedContextInlines.h" #include "mozilla/dom/BrowsingContext.h" #include "mozilla/dom/Document.h" +#include "mozilla/dom/UserActivationIPCUtils.h" #include "mozilla/PermissionDelegateIPCUtils.h" #include "mozilla/StaticPrefs_dom.h" #include "mozilla/StaticPtr.h" diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 92c743fb457b..da86bbd9d5eb 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -25,6 +25,7 @@ #include "mozilla/Encoding.h" #include "mozilla/EventStateManager.h" #include "mozilla/HTMLEditor.h" +#include "mozilla/InputTaskManager.h" #include "mozilla/LoadInfo.h" #include "mozilla/Logging.h" #include "mozilla/MediaFeatureChange.h" @@ -8866,7 +8867,7 @@ nsresult nsDocShell::HandleSameDocumentNavigation( bool hadActiveEntry = !!mActiveEntry; mActiveEntry = MakeUnique(mLoadingEntry->mInfo); mBrowsingContext->SessionHistoryCommit(*mLoadingEntry, mLoadType, - hadActiveEntry, true , true); + hadActiveEntry, true, true); // FIXME Need to set postdata. SetCacheKeyOnHistoryEntry(nullptr, cacheKey); diff --git a/docshell/base/nsDocShellEditorData.cpp b/docshell/base/nsDocShellEditorData.cpp index 9775ce8ace83..890191aaf464 100644 --- a/docshell/base/nsDocShellEditorData.cpp +++ b/docshell/base/nsDocShellEditorData.cpp @@ -7,6 +7,7 @@ #include "nsDocShellEditorData.h" #include "mozilla/dom/Document.h" +#include "mozilla/HTMLEditor.h" #include "nsIInterfaceRequestorUtils.h" #include "nsComponentManagerUtils.h" #include "nsPIDOMWindow.h" diff --git a/docshell/base/nsDocShellLoadState.cpp b/docshell/base/nsDocShellLoadState.cpp index 7d098e180243..564803fbfda8 100644 --- a/docshell/base/nsDocShellLoadState.cpp +++ b/docshell/base/nsDocShellLoadState.cpp @@ -19,6 +19,7 @@ #include "mozilla/Components.h" #include "mozilla/dom/BrowsingContext.h" #include "mozilla/dom/LoadURIOptionsBinding.h" +#include "mozilla/StaticPrefs_browser.h" #include "mozilla/StaticPrefs_fission.h" #include "mozilla/OriginAttributes.h" diff --git a/docshell/base/nsPingListener.cpp b/docshell/base/nsPingListener.cpp index 6c8bf170a6d0..23ac22048925 100644 --- a/docshell/base/nsPingListener.cpp +++ b/docshell/base/nsPingListener.cpp @@ -18,6 +18,7 @@ #include "nsIProtocolHandler.h" #include "nsIUploadChannel2.h" +#include "nsComponentManagerUtils.h" #include "nsNetUtil.h" #include "nsStreamUtils.h" #include "nsStringStream.h" diff --git a/docshell/base/timeline/AutoGlobalTimelineMarker.h b/docshell/base/timeline/AutoGlobalTimelineMarker.h index 02c37f0989c6..a9bbc92fcee6 100644 --- a/docshell/base/timeline/AutoGlobalTimelineMarker.h +++ b/docshell/base/timeline/AutoGlobalTimelineMarker.h @@ -7,6 +7,7 @@ #ifndef mozilla_AutoGlobalTimelineMarker_h_ #define mozilla_AutoGlobalTimelineMarker_h_ +#include "mozilla/Attributes.h" #include "TimelineMarkerEnums.h" namespace mozilla { diff --git a/docshell/base/timeline/TimelineConsumers.cpp b/docshell/base/timeline/TimelineConsumers.cpp index d09f36278241..805a54979c73 100644 --- a/docshell/base/timeline/TimelineConsumers.cpp +++ b/docshell/base/timeline/TimelineConsumers.cpp @@ -7,7 +7,9 @@ #include "TimelineConsumers.h" #include "mozilla/ClearOnShutdown.h" +#include "mozilla/ObservedDocShell.h" #include "mozilla/Services.h" +#include "mozilla/TimelineMarker.h" #include "jsapi.h" #include "nsAppRunner.h" // for XRE_IsContentProcess, XRE_IsParentProcess #include "nsCRT.h" diff --git a/docshell/shistory/SessionHistoryEntry.cpp b/docshell/shistory/SessionHistoryEntry.cpp index ad7d25e8b70a..98a00f07d9c0 100644 --- a/docshell/shistory/SessionHistoryEntry.cpp +++ b/docshell/shistory/SessionHistoryEntry.cpp @@ -5,17 +5,23 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "SessionHistoryEntry.h" +#include "ipc/IPCMessageUtilsSpecializations.h" +#include "nsDocShell.h" #include "nsDocShellLoadState.h" #include "nsIHttpChannel.h" #include "nsSHEntryShared.h" +#include "nsSHistory.h" #include "nsStructuredCloneContainer.h" #include "nsXULAppAPI.h" #include "mozilla/PresState.h" #include "mozilla/Tuple.h" #include "mozilla/dom/CSPMessageUtils.h" +#include "mozilla/dom/DOMTypes.h" #include "mozilla/dom/nsCSPContext.h" +#include "mozilla/dom/PermissionMessageUtils.h" #include "mozilla/dom/ReferrerInfoUtils.h" #include "mozilla/ipc/IPDLParamTraits.h" +#include "mozilla/ipc/ProtocolUtils.h" #include "mozilla/ipc/URIUtils.h" extern mozilla::LazyLogModule gSHLog; diff --git a/docshell/shistory/SessionHistoryEntry.h b/docshell/shistory/SessionHistoryEntry.h index 655eb6294fd2..d4b1b2fdd7ce 100644 --- a/docshell/shistory/SessionHistoryEntry.h +++ b/docshell/shistory/SessionHistoryEntry.h @@ -21,6 +21,11 @@ class nsIReferrerInfo; class nsISHistory; class nsIURI; +namespace mozilla::ipc { +template +struct IPDLParamTraits; +} + namespace mozilla { namespace dom { diff --git a/docshell/shistory/nsSHEntryShared.h b/docshell/shistory/nsSHEntryShared.h index 2c60fb59e7cc..28e559024ac7 100644 --- a/docshell/shistory/nsSHEntryShared.h +++ b/docshell/shistory/nsSHEntryShared.h @@ -22,9 +22,11 @@ class nsSHEntry; class nsISHEntry; class nsISHistory; +class nsIContentSecurityPolicy; class nsIContentViewer; class nsIDocShellTreeItem; class nsILayoutHistoryState; +class nsIPrincipal; class nsDocShellEditorData; class nsIMutableArray; class nsSHistory;