From f89a809df5e50fc4f7a58fcaac55861aa33a8e31 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 21 Feb 2019 20:01:53 +0100 Subject: Stop building /docshell unified and fix deprot. Tag #80 --- docshell/base/SerializedLoadContext.cpp | 1 + docshell/base/moz.build | 2 +- docshell/base/nsAboutRedirector.cpp | 1 + docshell/base/nsDSURIContentListener.cpp | 1 + docshell/base/nsDocShell.cpp | 1 + docshell/base/nsDocShellEditorData.cpp | 1 + docshell/base/timeline/ObservedDocShell.h | 1 + docshell/base/timeline/TimelineConsumers.h | 3 +++ docshell/base/timeline/TimelineMarker.cpp | 2 ++ docshell/base/timeline/moz.build | 2 +- docshell/shistory/moz.build | 2 +- docshell/shistory/nsSHEntry.cpp | 1 + docshell/shistory/nsSHEntryShared.h | 1 + 13 files changed, 16 insertions(+), 3 deletions(-) (limited to 'docshell') diff --git a/docshell/base/SerializedLoadContext.cpp b/docshell/base/SerializedLoadContext.cpp index b8e3eb929..281fd7bd6 100644 --- a/docshell/base/SerializedLoadContext.cpp +++ b/docshell/base/SerializedLoadContext.cpp @@ -7,6 +7,7 @@ #include "SerializedLoadContext.h" #include "nsNetUtil.h" #include "nsIChannel.h" +#include "nsILoadContext.h" #include "nsIPrivateBrowsingChannel.h" #include "nsIWebSocketChannel.h" diff --git a/docshell/base/moz.build b/docshell/base/moz.build index 6ea3e6d28..120465bac 100644 --- a/docshell/base/moz.build +++ b/docshell/base/moz.build @@ -50,7 +50,7 @@ EXPORTS.mozilla += [ 'LoadContext.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'LoadContext.cpp', 'nsAboutRedirector.cpp', 'nsDefaultURIFixup.cpp', diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp index 4dba7f261..f57d6c002 100644 --- a/docshell/base/nsAboutRedirector.cpp +++ b/docshell/base/nsAboutRedirector.cpp @@ -8,6 +8,7 @@ #include "nsNetUtil.h" #include "nsAboutProtocolUtils.h" #include "mozilla/ArrayUtils.h" +#include "nsIChannel.h" #include "nsIProtocolHandler.h" NS_IMPL_ISUPPORTS(nsAboutRedirector, nsIAboutModule) diff --git a/docshell/base/nsDSURIContentListener.cpp b/docshell/base/nsDSURIContentListener.cpp index ee6a4dd62..3f52251cc 100644 --- a/docshell/base/nsDSURIContentListener.cpp +++ b/docshell/base/nsDSURIContentListener.cpp @@ -24,6 +24,7 @@ #include "nsDocShellLoadTypes.h" #include "nsIMultiPartChannel.h" #include "mozilla/dom/nsCSPUtils.h" +#include "nsIStreamListener.h" using namespace mozilla; diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 7f8a693cc..d67780317 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -39,6 +39,7 @@ #include "nsIDOMDocument.h" #include "nsIDOMElement.h" +#include "nsAboutProtocolUtils.h" #include "nsArray.h" #include "nsArrayUtils.h" #include "nsContentSecurityManager.h" diff --git a/docshell/base/nsDocShellEditorData.cpp b/docshell/base/nsDocShellEditorData.cpp index 7e4068eb9..80c8c6ec3 100644 --- a/docshell/base/nsDocShellEditorData.cpp +++ b/docshell/base/nsDocShellEditorData.cpp @@ -8,6 +8,7 @@ #include "nsIInterfaceRequestorUtils.h" #include "nsComponentManagerUtils.h" #include "nsPIDOMWindow.h" +#include "nsIDocument.h" #include "nsIDOMDocument.h" #include "nsIEditor.h" #include "nsIEditingSession.h" diff --git a/docshell/base/timeline/ObservedDocShell.h b/docshell/base/timeline/ObservedDocShell.h index 05eafbd0c..b437de769 100644 --- a/docshell/base/timeline/ObservedDocShell.h +++ b/docshell/base/timeline/ObservedDocShell.h @@ -11,6 +11,7 @@ #include "mozilla/RefPtr.h" #include "mozilla/UniquePtr.h" #include "nsTArray.h" +#include "nsIDocShell.h" class nsIDocShell; diff --git a/docshell/base/timeline/TimelineConsumers.h b/docshell/base/timeline/TimelineConsumers.h index 04099e1b9..2a77b83ac 100644 --- a/docshell/base/timeline/TimelineConsumers.h +++ b/docshell/base/timeline/TimelineConsumers.h @@ -7,11 +7,14 @@ #define mozilla_TimelineConsumers_h_ #include "nsIObserver.h" +#include "nsIDocShell.h" #include "mozilla/StaticPtr.h" #include "mozilla/UniquePtr.h" #include "mozilla/LinkedList.h" #include "mozilla/StaticMutex.h" #include "TimelineMarkerEnums.h" // for MarkerTracingType +#include "mozilla/dom/ProfileTimelineMarkerBinding.h" +#include "nsTArray.h" class nsDocShell; class nsIDocShell; diff --git a/docshell/base/timeline/TimelineMarker.cpp b/docshell/base/timeline/TimelineMarker.cpp index b83e9ceb4..0bf248313 100644 --- a/docshell/base/timeline/TimelineMarker.cpp +++ b/docshell/base/timeline/TimelineMarker.cpp @@ -5,6 +5,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "TimelineMarker.h" +#include "mozilla/dom/ProfileTimelineMarkerBinding.h" +#include "nsContentUtils.h" namespace mozilla { diff --git a/docshell/base/timeline/moz.build b/docshell/base/timeline/moz.build index 824e37466..61cc4ec08 100644 --- a/docshell/base/timeline/moz.build +++ b/docshell/base/timeline/moz.build @@ -25,7 +25,7 @@ EXPORTS.mozilla += [ 'WorkerTimelineMarker.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'AbstractTimelineMarker.cpp', 'AutoGlobalTimelineMarker.cpp', 'AutoTimelineMarker.cpp', diff --git a/docshell/shistory/moz.build b/docshell/shistory/moz.build index c85c3a3cb..3d3fb51a2 100644 --- a/docshell/shistory/moz.build +++ b/docshell/shistory/moz.build @@ -23,7 +23,7 @@ EXPORTS += [ 'nsSHEntryShared.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsSHEntry.cpp', 'nsSHEntryShared.cpp', 'nsSHistory.cpp', diff --git a/docshell/shistory/nsSHEntry.cpp b/docshell/shistory/nsSHEntry.cpp index 6b0b066d9..89ba2ebeb 100644 --- a/docshell/shistory/nsSHEntry.cpp +++ b/docshell/shistory/nsSHEntry.cpp @@ -15,6 +15,7 @@ #include "nsIInputStream.h" #include "nsIURI.h" #include "mozilla/net/ReferrerPolicy.h" +#include "nsArray.h" #include namespace dom = mozilla::dom; diff --git a/docshell/shistory/nsSHEntryShared.h b/docshell/shistory/nsSHEntryShared.h index 0a40691ff..afeb33863 100644 --- a/docshell/shistory/nsSHEntryShared.h +++ b/docshell/shistory/nsSHEntryShared.h @@ -12,6 +12,7 @@ #include "nsCOMArray.h" #include "nsIBFCacheEntry.h" #include "nsIMutationObserver.h" +#include "nsISHEntry.h" #include "nsExpirationTracker.h" #include "nsRect.h" #include "nsString.h" -- cgit v1.2.3