From a053cf1c15a3a17f1d5a2119991c82f1253b078a Mon Sep 17 00:00:00 2001 From: Andrea Marchesini Date: Tue, 17 Jul 2018 21:37:48 +0200 Subject: [PATCH] Bug 1476306 - Moving NullPrincipal/ContentPrincipal/SystemPrincipal under mozilla namespace - part 1 - NullPrincipal, r=ckerschb --- caps/BasePrincipal.cpp | 2 +- caps/NullPrincipal.cpp | 2 +- caps/NullPrincipal.h | 18 +++++++++++------- caps/NullPrincipalURI.cpp | 6 ++++-- caps/NullPrincipalURI.h | 16 +++++++++------- caps/moz.build | 4 ++-- caps/nsScriptSecurityManager.cpp | 2 +- docshell/base/nsDocShell.cpp | 2 +- dom/base/DOMParser.cpp | 2 +- dom/base/Location.cpp | 2 +- dom/base/nsContentUtils.cpp | 2 +- dom/base/nsDocument.cpp | 2 +- dom/base/nsFrameLoader.cpp | 2 +- dom/base/nsNodeInfoManager.cpp | 2 +- dom/base/nsTreeSanitizer.cpp | 2 +- dom/bindings/SimpleGlobalObject.cpp | 2 +- dom/console/ConsoleUtils.cpp | 2 +- dom/indexedDB/IDBObjectStore.cpp | 2 +- dom/ipc/ContentChild.cpp | 2 +- dom/ipc/TabParent.cpp | 2 +- dom/media/MediaManager.cpp | 2 +- dom/plugins/base/nsPluginHost.cpp | 2 +- .../base/nsPluginStreamListenerPeer.cpp | 2 +- dom/security/test/gtest/TestSecureContext.cpp | 4 +++- .../pref/autoconfig/src/nsJSConfigTriggers.cpp | 3 ++- gfx/thebes/gfxSVGGlyphs.cpp | 2 +- image/decoders/icon/android/nsIconChannel.cpp | 2 +- image/decoders/icon/gtk/nsIconChannel.cpp | 5 +++-- image/imgLoader.cpp | 2 +- ipc/glue/BackgroundUtils.cpp | 2 +- ipc/glue/URIUtils.cpp | 2 +- js/xpconnect/src/Sandbox.cpp | 2 +- layout/build/nsLayoutModule.cpp | 2 +- layout/style/StyleSheet.cpp | 2 +- layout/style/URLExtraData.cpp | 2 +- layout/style/test/gtest/StyloParsingBench.cpp | 2 +- .../src/peerconnection/PeerConnectionImpl.cpp | 2 +- netwerk/base/LoadInfo.cpp | 2 +- netwerk/protocol/ftp/nsFtpConnectionThread.cpp | 2 +- netwerk/protocol/gio/nsGIOProtocolHandler.cpp | 2 +- netwerk/protocol/http/HttpBaseChannel.cpp | 2 +- netwerk/protocol/http/nsCORSListenerProxy.cpp | 2 +- netwerk/protocol/http/nsHttpChannel.cpp | 2 +- .../viewsource/nsViewSourceChannel.cpp | 5 +++-- parser/html/nsParserUtils.cpp | 5 +++-- parser/htmlparser/nsExpatDriver.cpp | 4 ++-- parser/xml/nsSAXXMLReader.cpp | 2 +- toolkit/components/places/nsFaviconService.cpp | 2 +- xpfe/appshell/nsContentTreeOwner.cpp | 2 +- 49 files changed, 81 insertions(+), 67 deletions(-) diff --git a/caps/BasePrincipal.cpp b/caps/BasePrincipal.cpp index 08ab4f006643..cabdb7f40819 100644 --- a/caps/BasePrincipal.cpp +++ b/caps/BasePrincipal.cpp @@ -14,9 +14,9 @@ #include "ContentPrincipal.h" #include "ExpandedPrincipal.h" +#include "mozilla/NullPrincipal.h" #include "nsNetUtil.h" #include "nsIURIWithPrincipal.h" -#include "NullPrincipal.h" #include "nsScriptSecurityManager.h" #include "nsServiceManagerUtils.h" diff --git a/caps/NullPrincipal.cpp b/caps/NullPrincipal.cpp index 1ffe8414717a..0df5b514d771 100644 --- a/caps/NullPrincipal.cpp +++ b/caps/NullPrincipal.cpp @@ -69,7 +69,7 @@ NullPrincipal::Create(const OriginAttributes& aOriginAttributes, nsIURI* aURI) /* static */ already_AddRefed NullPrincipal::CreateWithoutOriginAttributes() { - return NullPrincipal::Create(mozilla::OriginAttributes(), nullptr); + return NullPrincipal::Create(OriginAttributes(), nullptr); } nsresult diff --git a/caps/NullPrincipal.h b/caps/NullPrincipal.h index 8f39d85dc55f..99ae2ec5b2cc 100644 --- a/caps/NullPrincipal.h +++ b/caps/NullPrincipal.h @@ -9,8 +9,8 @@ * same-origin with anything but themselves. */ -#ifndef NullPrincipal_h -#define NullPrincipal_h +#ifndef mozilla_NullPrincipal_h +#define mozilla_NullPrincipal_h #include "nsIPrincipal.h" #include "nsJSPrincipals.h" @@ -30,7 +30,9 @@ class nsIURI; #define NS_NULLPRINCIPAL_SCHEME "moz-nullprincipal" -class NullPrincipal final : public mozilla::BasePrincipal +namespace mozilla { + +class NullPrincipal final : public BasePrincipal { public: // This should only be used by deserialization, and the factory constructor. @@ -64,13 +66,13 @@ public: CreateWithInheritedAttributes(nsIDocShell* aDocShell, bool aIsFirstParty = false); static already_AddRefed - Create(const mozilla::OriginAttributes& aOriginAttributes, + Create(const OriginAttributes& aOriginAttributes, nsIURI* aURI = nullptr); static already_AddRefed CreateWithoutOriginAttributes(); - nsresult Init(const mozilla::OriginAttributes& aOriginAttributes = mozilla::OriginAttributes(), + nsresult Init(const OriginAttributes& aOriginAttributes = OriginAttributes(), nsIURI* aURI = nullptr); virtual nsresult GetScriptLocation(nsACString &aStr) override; @@ -91,7 +93,9 @@ private: // If aIsFirstParty is true, this NullPrincipal will be initialized base on // the aOriginAttributes with FirstPartyDomain set to an unique value, and this // value is generated from mURI.path, with ".mozilla" appending at the end. - nsresult Init(const mozilla::OriginAttributes& aOriginAttributes, bool aIsFirstParty); + nsresult Init(const OriginAttributes& aOriginAttributes, bool aIsFirstParty); }; -#endif // NullPrincipal_h__ +} // mozilla namespace + +#endif // mozilla_NullPrincipal_h diff --git a/caps/NullPrincipalURI.cpp b/caps/NullPrincipalURI.cpp index df1e8fb1dfaa..edd60abbaf30 100644 --- a/caps/NullPrincipalURI.cpp +++ b/caps/NullPrincipalURI.cpp @@ -15,6 +15,8 @@ #include "nsCRT.h" #include "nsIUUIDGenerator.h" +using namespace mozilla; + //////////////////////////////////////////////////////////////////////////////// //// NullPrincipalURI @@ -406,13 +408,13 @@ NullPrincipalURI::Deserialize(const mozilla::ipc::URIParams& aParams) //// nsISizeOf size_t -NullPrincipalURI::SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const +NullPrincipalURI::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const { return mPath.SizeOfExcludingThisIfUnshared(aMallocSizeOf); } size_t -NullPrincipalURI::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const +NullPrincipalURI::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const { return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf); } diff --git a/caps/NullPrincipalURI.h b/caps/NullPrincipalURI.h index fb97a0a1900d..bfc3092e0f87 100644 --- a/caps/NullPrincipalURI.h +++ b/caps/NullPrincipalURI.h @@ -8,8 +8,8 @@ * This wraps nsSimpleURI so that all calls to it are done on the main thread. */ -#ifndef __NullPrincipalURI_h__ -#define __NullPrincipalURI_h__ +#ifndef mozilla_NullPrincipalURI_h +#define mozilla_NullPrincipalURI_h #include "nsIURI.h" #include "nsISizeOf.h" @@ -27,8 +27,8 @@ {0xb9, 0x1b, 0x6b, 0x54, 0x10, 0x22, 0x36, 0xe6} } namespace mozilla { + class Encoding; -} class NullPrincipalURI final : public nsIURI , public nsISizeOf @@ -40,8 +40,8 @@ public: NS_DECL_NSIIPCSERIALIZABLEURI // nsISizeOf - virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const override; - virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const override; + virtual size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override; + virtual size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override; // Returns null on failure. static already_AddRefed Create(); @@ -69,7 +69,7 @@ private: nsresult SetRef(const nsACString &input); nsresult SetFilePath(const nsACString &input); nsresult SetQuery(const nsACString &input); - nsresult SetQueryWithEncoding(const nsACString &input, const mozilla::Encoding* encoding); + nsresult SetQueryWithEncoding(const nsACString &input, const Encoding* encoding); bool Deserialize(const mozilla::ipc::URIParams&); public: @@ -110,4 +110,6 @@ public: friend class BaseURIMutator; }; -#endif // __NullPrincipalURI_h__ +} // mozilla namespace + +#endif // mozilla_NullPrincipalURI_h diff --git a/caps/moz.build b/caps/moz.build index de1704f3d761..e8f7a1a3a8d0 100644 --- a/caps/moz.build +++ b/caps/moz.build @@ -27,13 +27,13 @@ EXPORTS += [ 'ContentPrincipal.h', 'nsJSPrincipals.h', 'nsScriptSecurityManager.h', - 'NullPrincipal.h', - 'NullPrincipalURI.h', 'SystemPrincipal.h', ] EXPORTS.mozilla = [ 'BasePrincipal.h', + 'NullPrincipal.h', + 'NullPrincipalURI.h', 'OriginAttributes.h', ] diff --git a/caps/nsScriptSecurityManager.cpp b/caps/nsScriptSecurityManager.cpp index 2c0c35739081..da4c6cddb916 100644 --- a/caps/nsScriptSecurityManager.cpp +++ b/caps/nsScriptSecurityManager.cpp @@ -23,7 +23,6 @@ #include "mozilla/BasePrincipal.h" #include "ExpandedPrincipal.h" #include "SystemPrincipal.h" -#include "NullPrincipal.h" #include "DomainPolicy.h" #include "nsString.h" #include "nsCRT.h" @@ -59,6 +58,7 @@ #include "nsIAsyncVerifyRedirectCallback.h" #include "mozilla/Preferences.h" #include "mozilla/dom/BindingUtils.h" +#include "mozilla/NullPrincipal.h" #include #include "mozilla/dom/ScriptSettings.h" #include "mozilla/ClearOnShutdown.h" diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index f96b5fcbd252..c77eca4fb77c 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -199,8 +199,8 @@ #include "nsXULAppAPI.h" #include "GeckoProfiler.h" +#include "mozilla/NullPrincipal.h" #include "Navigator.h" -#include "NullPrincipal.h" #include "prenv.h" #include "URIUtils.h" diff --git a/dom/base/DOMParser.cpp b/dom/base/DOMParser.cpp index 243f022ebd4e..68b1def31088 100644 --- a/dom/base/DOMParser.cpp +++ b/dom/base/DOMParser.cpp @@ -19,8 +19,8 @@ #include "nsDOMJSUtils.h" #include "nsError.h" #include "nsPIDOMWindow.h" -#include "NullPrincipal.h" #include "mozilla/LoadInfo.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/dom/BindingUtils.h" #include "mozilla/dom/ScriptSettings.h" diff --git a/dom/base/Location.cpp b/dom/base/Location.cpp index 4e1c0ea48263..8f384cdc71cd 100644 --- a/dom/base/Location.cpp +++ b/dom/base/Location.cpp @@ -31,7 +31,7 @@ #include "nsGlobalWindow.h" #include "mozilla/Likely.h" #include "nsCycleCollectionParticipant.h" -#include "NullPrincipal.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/Unused.h" #include "mozilla/dom/LocationBinding.h" #include "mozilla/dom/ScriptSettings.h" diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index f428fdfc29cc..ba6022f383b3 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -158,6 +158,7 @@ #include "nsIMIMEService.h" #include "nsINode.h" #include "mozilla/dom/NodeInfo.h" +#include "mozilla/NullPrincipal.h" #include "nsIObjectLoadingContent.h" #include "nsIObserver.h" #include "nsIObserverService.h" @@ -187,7 +188,6 @@ #include "nsNetCID.h" #include "nsNetUtil.h" #include "nsNodeInfoManager.h" -#include "NullPrincipal.h" #include "nsParserCIID.h" #include "nsParserConstants.h" #include "nsPIDOMWindow.h" diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index 1a3d3e0a0ae9..aeae94b4eced 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -110,7 +110,7 @@ #include "nsIPermissionManager.h" #include "nsIPrincipal.h" #include "ExpandedPrincipal.h" -#include "NullPrincipal.h" +#include "mozilla/NullPrincipal.h" #include "nsIDOMWindow.h" #include "nsPIDOMWindow.h" diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp index 72d1c2e451ea..c5ac488152b1 100644 --- a/dom/base/nsFrameLoader.cpp +++ b/dom/base/nsFrameLoader.cpp @@ -44,7 +44,6 @@ #include "nsIXULWindow.h" #include "nsIMozBrowserFrame.h" #include "nsISHistory.h" -#include "NullPrincipal.h" #include "nsIScriptError.h" #include "nsGlobalWindow.h" #include "nsHTMLDocument.h" @@ -76,6 +75,7 @@ #include "mozilla/BasePrincipal.h" #include "mozilla/GuardObjects.h" #include "mozilla/HTMLEditor.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/Preferences.h" #include "mozilla/Unused.h" #include "mozilla/dom/ChromeMessageSender.h" diff --git a/dom/base/nsNodeInfoManager.cpp b/dom/base/nsNodeInfoManager.cpp index 5ef019fa97cb..6e5392fa1d25 100644 --- a/dom/base/nsNodeInfoManager.cpp +++ b/dom/base/nsNodeInfoManager.cpp @@ -13,6 +13,7 @@ #include "mozilla/DebugOnly.h" #include "mozilla/dom/NodeInfo.h" #include "mozilla/dom/NodeInfoInlines.h" +#include "mozilla/NullPrincipal.h" #include "nsCOMPtr.h" #include "nsString.h" #include "nsAtom.h" @@ -30,7 +31,6 @@ #include "nsNameSpaceManager.h" #include "nsDocument.h" #include "nsWindowSizes.h" -#include "NullPrincipal.h" using namespace mozilla; using mozilla::dom::NodeInfo; diff --git a/dom/base/nsTreeSanitizer.cpp b/dom/base/nsTreeSanitizer.cpp index b2a2066af3ff..d2a3b63d1652 100644 --- a/dom/base/nsTreeSanitizer.cpp +++ b/dom/base/nsTreeSanitizer.cpp @@ -14,6 +14,7 @@ #include "mozilla/dom/CSSRuleList.h" #include "mozilla/dom/DocumentFragment.h" #include "mozilla/dom/SRIMetadata.h" +#include "mozilla/NullPrincipal.h" #include "nsCSSPropertyID.h" #include "nsUnicharInputStream.h" #include "nsAttrName.h" @@ -21,7 +22,6 @@ #include "nsIScriptSecurityManager.h" #include "nsNetUtil.h" #include "nsComponentManagerUtils.h" -#include "NullPrincipal.h" #include "nsContentUtils.h" #include "nsIParserUtils.h" #include "nsIDocument.h" diff --git a/dom/bindings/SimpleGlobalObject.cpp b/dom/bindings/SimpleGlobalObject.cpp index e9b1ff86aad9..fe7acbadb2ed 100644 --- a/dom/bindings/SimpleGlobalObject.cpp +++ b/dom/bindings/SimpleGlobalObject.cpp @@ -10,13 +10,13 @@ #include "js/Class.h" #include "nsJSPrincipals.h" -#include "NullPrincipal.h" #include "nsThreadUtils.h" #include "nsContentUtils.h" #include "xpcprivate.h" #include "mozilla/dom/ScriptSettings.h" +#include "mozilla/NullPrincipal.h" namespace mozilla { namespace dom { diff --git a/dom/console/ConsoleUtils.cpp b/dom/console/ConsoleUtils.cpp index 33417d4ba2b7..9b8926e7e38a 100644 --- a/dom/console/ConsoleUtils.cpp +++ b/dom/console/ConsoleUtils.cpp @@ -8,7 +8,7 @@ #include "ConsoleCommon.h" #include "mozilla/ClearOnShutdown.h" -#include "NullPrincipal.h" +#include "mozilla/NullPrincipal.h" namespace mozilla { namespace dom { diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp index 6c5caba66374..2dfe56b2362e 100644 --- a/dom/indexedDB/IDBObjectStore.cpp +++ b/dom/indexedDB/IDBObjectStore.cpp @@ -23,12 +23,12 @@ #include "js/Date.h" #include "js/StructuredClone.h" #include "KeyPath.h" -#include "NullPrincipal.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/EndianUtils.h" #include "mozilla/ErrorResult.h" #include "mozilla/JSObjectHolder.h" #include "mozilla/Move.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/dom/BindingUtils.h" #include "mozilla/dom/ContentChild.h" #include "mozilla/dom/ContentParent.h" diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp index 34ca7c7617f5..baaaac9bd736 100644 --- a/dom/ipc/ContentChild.cpp +++ b/dom/ipc/ContentChild.cpp @@ -17,6 +17,7 @@ #include "mozilla/Attributes.h" #include "mozilla/BackgroundHangMonitor.h" #include "mozilla/LookAndFeel.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/Preferences.h" #include "mozilla/ProcessHangMonitorIPC.h" #include "mozilla/Unused.h" @@ -85,7 +86,6 @@ #include "mozilla/HangDetails.h" #include "imgLoader.h" #include "GMPServiceChild.h" -#include "NullPrincipal.h" #include "nsISimpleEnumerator.h" #include "nsIStringBundle.h" #include "nsIWorkerDebuggerManager.h" diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index 1d8b919f85d2..e12f9118b646 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -95,10 +95,10 @@ #include "ImageOps.h" #include "UnitTransforms.h" #include +#include "mozilla/NullPrincipal.h" #include "mozilla/WebBrowserPersistDocumentParent.h" #include "ProcessPriorityManager.h" #include "nsString.h" -#include "NullPrincipal.h" #ifdef XP_WIN #include "mozilla/plugins/PluginWidgetParent.h" diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp index 17d4411b26ad..cc32a7841178 100644 --- a/dom/media/MediaManager.cpp +++ b/dom/media/MediaManager.cpp @@ -36,6 +36,7 @@ #include "nsPIDOMWindow.h" #include "mozilla/EventStateManager.h" #include "mozilla/MozPromise.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/Telemetry.h" #include "mozilla/Types.h" #include "mozilla/PeerIdentity.h" @@ -57,7 +58,6 @@ #include "ThreadSafeRefcountingWithMainThreadDestruction.h" #include "Latency.h" #include "nsProxyRelease.h" -#include "NullPrincipal.h" #include "nsVariant.h" // For snprintf diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp index f6b593441e34..da1753251a4d 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -50,6 +50,7 @@ #include "nsIWritablePropertyBag2.h" #include "nsICategoryManager.h" #include "nsPluginStreamListenerPeer.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/dom/ContentChild.h" #include "mozilla/dom/ContentParent.h" #include "mozilla/dom/Element.h" @@ -96,7 +97,6 @@ #include "nsIImageLoadingContent.h" #include "mozilla/Preferences.h" #include "nsVersionComparator.h" -#include "NullPrincipal.h" #include "mozilla/dom/Promise.h" diff --git a/dom/plugins/base/nsPluginStreamListenerPeer.cpp b/dom/plugins/base/nsPluginStreamListenerPeer.cpp index e10c943ae87a..24055500f962 100644 --- a/dom/plugins/base/nsPluginStreamListenerPeer.cpp +++ b/dom/plugins/base/nsPluginStreamListenerPeer.cpp @@ -31,7 +31,7 @@ #include "GeckoProfiler.h" #include "nsPluginInstanceOwner.h" #include "nsDataHashtable.h" -#include "NullPrincipal.h" +#include "mozilla/NullPrincipal.h" // nsPluginStreamListenerPeer diff --git a/dom/security/test/gtest/TestSecureContext.cpp b/dom/security/test/gtest/TestSecureContext.cpp index 5017ec9fa972..bfd6834d4d2a 100644 --- a/dom/security/test/gtest/TestSecureContext.cpp +++ b/dom/security/test/gtest/TestSecureContext.cpp @@ -13,7 +13,9 @@ #include "nsContentUtils.h" #include "nsIPrincipal.h" #include "nsScriptSecurityManager.h" -#include "NullPrincipal.h" +#include "mozilla/NullPrincipal.h" + +using namespace mozilla; static const uint32_t kURIMaxLength = 64; diff --git a/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp b/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp index d19b7acf2379..efb2187ea96e 100644 --- a/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp +++ b/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp @@ -16,15 +16,16 @@ #include "nspr.h" #include "mozilla/Attributes.h" #include "mozilla/Maybe.h" +#include "mozilla/NullPrincipal.h" #include "nsContentUtils.h" #include "nsIScriptSecurityManager.h" #include "nsJSPrincipals.h" #include "nsIScriptError.h" #include "js/Wrapper.h" -#include "NullPrincipal.h" extern mozilla::LazyLogModule MCD; using mozilla::AutoSafeJSContext; +using mozilla::NullPrincipal; using mozilla::dom::AutoJSAPI; //***************************************************************************** diff --git a/gfx/thebes/gfxSVGGlyphs.cpp b/gfx/thebes/gfxSVGGlyphs.cpp index a28824d2eea8..99ee3c66f83f 100644 --- a/gfx/thebes/gfxSVGGlyphs.cpp +++ b/gfx/thebes/gfxSVGGlyphs.cpp @@ -15,7 +15,6 @@ #include "nsServiceManagerUtils.h" #include "nsIPresShell.h" #include "nsNetUtil.h" -#include "NullPrincipal.h" #include "nsIInputStream.h" #include "nsStringStream.h" #include "nsStreamUtils.h" @@ -25,6 +24,7 @@ #include "mozilla/dom/FontTableURIProtocolHandler.h" #include "mozilla/dom/SVGDocument.h" #include "mozilla/LoadInfo.h" +#include "mozilla/NullPrincipal.h" #include "nsSVGUtils.h" #include "nsContentUtils.h" #include "gfxFont.h" diff --git a/image/decoders/icon/android/nsIconChannel.cpp b/image/decoders/icon/android/nsIconChannel.cpp index 70bfe0a7685e..0cc53c1bc662 100644 --- a/image/decoders/icon/android/nsIconChannel.cpp +++ b/image/decoders/icon/android/nsIconChannel.cpp @@ -5,6 +5,7 @@ #include #include "mozilla/dom/ContentChild.h" +#include "mozilla/NullPrincipal.h" #include "nsMimeTypes.h" #include "nsIURL.h" #include "nsXULAppAPI.h" @@ -13,7 +14,6 @@ #include "nsIStringStream.h" #include "nsNetUtil.h" #include "nsComponentManagerUtils.h" -#include "NullPrincipal.h" NS_IMPL_ISUPPORTS(nsIconChannel, nsIRequest, diff --git a/image/decoders/icon/gtk/nsIconChannel.cpp b/image/decoders/icon/gtk/nsIconChannel.cpp index 7962d05b63cd..10a32887e555 100644 --- a/image/decoders/icon/gtk/nsIconChannel.cpp +++ b/image/decoders/icon/gtk/nsIconChannel.cpp @@ -10,6 +10,7 @@ #include "mozilla/DebugOnly.h" #include "mozilla/EndianUtils.h" +#include "mozilla/NullPrincipal.h" #include #include @@ -25,7 +26,6 @@ #include "nsComponentManagerUtils.h" #include "nsIStringStream.h" #include "nsServiceManagerUtils.h" -#include "NullPrincipal.h" #include "nsIURL.h" #include "prlink.h" #include "gfxPlatform.h" @@ -106,7 +106,8 @@ moz_gdk_pixbuf_to_channel(GdkPixbuf* aPixbuf, nsIURI* aURI, // nsIconProtocolHandler::NewChannel2 will provide the correct loadInfo for // this iconChannel. Use the most restrictive security settings for the // temporary loadInfo to make sure the channel can not be openend. - nsCOMPtr nullPrincipal = NullPrincipal::CreateWithoutOriginAttributes(); + nsCOMPtr nullPrincipal = + mozilla::NullPrincipal::CreateWithoutOriginAttributes(); return NS_NewInputStreamChannel(aChannel, aURI, stream.forget(), diff --git a/image/imgLoader.cpp b/image/imgLoader.cpp index af99776f31ad..ae2c75390b74 100644 --- a/image/imgLoader.cpp +++ b/image/imgLoader.cpp @@ -9,11 +9,11 @@ #include "ImageLogging.h" #include "imgLoader.h" -#include "NullPrincipal.h" #include "mozilla/Attributes.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/Move.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/Preferences.h" #include "mozilla/ChaosMode.h" #include "mozilla/LoadInfo.h" diff --git a/ipc/glue/BackgroundUtils.cpp b/ipc/glue/BackgroundUtils.cpp index b6855d059a1a..70925484f446 100644 --- a/ipc/glue/BackgroundUtils.cpp +++ b/ipc/glue/BackgroundUtils.cpp @@ -9,6 +9,7 @@ #include "MainThreadUtils.h" #include "mozilla/Assertions.h" #include "mozilla/BasePrincipal.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/ipc/PBackgroundSharedTypes.h" #include "mozilla/ipc/URIUtils.h" #include "mozilla/net/NeckoChannelParams.h" @@ -18,7 +19,6 @@ #include "nsNetUtil.h" #include "mozilla/LoadInfo.h" #include "ContentPrincipal.h" -#include "NullPrincipal.h" #include "nsContentUtils.h" #include "nsString.h" #include "nsTArray.h" diff --git a/ipc/glue/URIUtils.cpp b/ipc/glue/URIUtils.cpp index 726d9949a183..b2f07d5b7aa9 100644 --- a/ipc/glue/URIUtils.cpp +++ b/ipc/glue/URIUtils.cpp @@ -11,12 +11,12 @@ #include "mozilla/ArrayUtils.h" #include "mozilla/Assertions.h" #include "mozilla/dom/BlobURL.h" +#include "mozilla/NullPrincipalURI.h" #include "nsComponentManagerUtils.h" #include "nsDebug.h" #include "nsID.h" #include "nsJARURI.h" #include "nsIIconURI.h" -#include "NullPrincipalURI.h" #include "nsJSProtocolHandler.h" #include "nsNetCID.h" #include "nsSimpleNestedURI.h" diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp index 0681ef5c68bc..fc16f076aa96 100644 --- a/js/xpconnect/src/Sandbox.cpp +++ b/js/xpconnect/src/Sandbox.cpp @@ -20,7 +20,6 @@ #include "nsIURI.h" #include "nsJSUtils.h" #include "nsNetUtil.h" -#include "NullPrincipal.h" #include "ExpandedPrincipal.h" #include "WrapperFactory.h" #include "xpcprivate.h" @@ -62,6 +61,7 @@ #include "mozilla/dom/XMLSerializerBinding.h" #include "mozilla/dom/FormDataBinding.h" #include "mozilla/DeferredFinalize.h" +#include "mozilla/NullPrincipal.h" using namespace mozilla; using namespace JS; diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp index 8a383275bdb0..82862a825750 100644 --- a/layout/build/nsLayoutModule.cpp +++ b/layout/build/nsLayoutModule.cpp @@ -102,7 +102,7 @@ using mozilla::dom::AudioChannelAgent; #include "ContentPrincipal.h" #include "ExpandedPrincipal.h" #include "SystemPrincipal.h" -#include "NullPrincipal.h" +#include "mozilla/NullPrincipal.h" #include "nsNetCID.h" #if defined(MOZ_WIDGET_ANDROID) #include "nsHapticFeedback.h" diff --git a/layout/style/StyleSheet.cpp b/layout/style/StyleSheet.cpp index 3ad1b99621b2..f0f214137895 100644 --- a/layout/style/StyleSheet.cpp +++ b/layout/style/StyleSheet.cpp @@ -15,6 +15,7 @@ #include "mozilla/dom/MediaList.h" #include "mozilla/dom/ShadowRoot.h" #include "mozilla/dom/ShadowRootBinding.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/ServoBindings.h" #include "mozilla/ServoCSSRuleList.h" #include "mozilla/ServoStyleSet.h" @@ -22,7 +23,6 @@ #include "mozilla/StyleSheetInlines.h" #include "mozAutoDocUpdate.h" -#include "NullPrincipal.h" namespace mozilla { diff --git a/layout/style/URLExtraData.cpp b/layout/style/URLExtraData.cpp index 8890dcbbcb27..08a56861c0b0 100644 --- a/layout/style/URLExtraData.cpp +++ b/layout/style/URLExtraData.cpp @@ -8,8 +8,8 @@ #include "mozilla/URLExtraData.h" +#include "mozilla/NullPrincipalURI.h" #include "nsProxyRelease.h" -#include "NullPrincipalURI.h" namespace mozilla { diff --git a/layout/style/test/gtest/StyloParsingBench.cpp b/layout/style/test/gtest/StyloParsingBench.cpp index 248ffb3c042f..f871ae818e80 100644 --- a/layout/style/test/gtest/StyloParsingBench.cpp +++ b/layout/style/test/gtest/StyloParsingBench.cpp @@ -9,8 +9,8 @@ #include "nsString.h" #include "ExampleStylesheet.h" #include "ServoBindings.h" -#include "NullPrincipalURI.h" #include "mozilla/Encoding.h" +#include "mozilla/NullPrincipalURI.h" using namespace mozilla; using namespace mozilla::css; diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp index 9eaae715275d..61a663280ef4 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp @@ -66,6 +66,7 @@ #include "nsDOMDataChannel.h" #include "mozilla/dom/Location.h" #include "mozilla/dom/Performance.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/TimeStamp.h" #include "mozilla/Telemetry.h" #include "mozilla/Preferences.h" @@ -78,7 +79,6 @@ #include "nsURLHelper.h" #include "nsNetUtil.h" #include "nsIURLParser.h" -#include "NullPrincipal.h" #include "js/GCAnnotations.h" #include "mozilla/PeerIdentity.h" #include "mozilla/dom/RTCCertificate.h" diff --git a/netwerk/base/LoadInfo.cpp b/netwerk/base/LoadInfo.cpp index de4b5de0e60c..f0e7876523fc 100644 --- a/netwerk/base/LoadInfo.cpp +++ b/netwerk/base/LoadInfo.cpp @@ -12,6 +12,7 @@ #include "mozilla/dom/PerformanceStorage.h" #include "mozilla/dom/TabChild.h" #include "mozilla/dom/ToJSValue.h" +#include "mozilla/NullPrincipal.h" #include "mozIThirdPartyUtil.h" #include "nsFrameLoader.h" #include "nsIContentSecurityPolicy.h" @@ -25,7 +26,6 @@ #include "nsDocShell.h" #include "nsGlobalWindow.h" #include "nsMixedContentBlocker.h" -#include "NullPrincipal.h" #include "nsRedirectHistoryEntry.h" #include "LoadInfo.h" diff --git a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp index b1eb78a97d4e..33f2fa0b6ab7 100644 --- a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp +++ b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp @@ -8,6 +8,7 @@ #include "prprf.h" #include "mozilla/Logging.h" +#include "mozilla/NullPrincipal.h" #include "prtime.h" #include "nsIOService.h" @@ -42,7 +43,6 @@ #include "nsIURI.h" #include "nsIURIMutator.h" #include "nsILoadInfo.h" -#include "NullPrincipal.h" #include "nsIAuthPrompt2.h" #include "nsIFTPChannelParentInternal.h" diff --git a/netwerk/protocol/gio/nsGIOProtocolHandler.cpp b/netwerk/protocol/gio/nsGIOProtocolHandler.cpp index d36c4ea3f097..202aea6e6223 100644 --- a/netwerk/protocol/gio/nsGIOProtocolHandler.cpp +++ b/netwerk/protocol/gio/nsGIOProtocolHandler.cpp @@ -8,6 +8,7 @@ * input stream provided by GVFS/GIO. */ #include "mozilla/ModuleUtils.h" +#include "mozilla/NullPrincipal.h" #include "nsIPrefService.h" #include "nsIPrefBranch.h" #include "nsIObserver.h" @@ -25,7 +26,6 @@ #include "nsIChannel.h" #include "nsIInputStream.h" #include "nsIProtocolHandler.h" -#include "NullPrincipal.h" #include "mozilla/Monitor.h" #include "plstr.h" #include "prtime.h" diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 77f6a007ceca..a59c81e2bd01 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -42,6 +42,7 @@ #include "nsINetworkInterceptController.h" #include "mozilla/dom/Performance.h" #include "mozilla/dom/PerformanceStorage.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/Services.h" #include "mozIThirdPartyUtil.h" #include "nsStreamUtils.h" @@ -51,7 +52,6 @@ #include "nsILoadGroupChild.h" #include "mozilla/ConsoleReportCollector.h" #include "LoadInfo.h" -#include "NullPrincipal.h" #include "nsISSLSocketControl.h" #include "mozilla/Telemetry.h" #include "nsIURL.h" diff --git a/netwerk/protocol/http/nsCORSListenerProxy.cpp b/netwerk/protocol/http/nsCORSListenerProxy.cpp index ab2cae3d336d..9b762c9c80f0 100644 --- a/netwerk/protocol/http/nsCORSListenerProxy.cpp +++ b/netwerk/protocol/http/nsCORSListenerProxy.cpp @@ -38,11 +38,11 @@ #include "nsIDOMWindowUtils.h" #include "nsIDOMWindow.h" #include "nsINetworkInterceptController.h" -#include "NullPrincipal.h" #include "nsICorsPreflightCallback.h" #include "nsISupportsImpl.h" #include "nsHttpChannel.h" #include "mozilla/LoadInfo.h" +#include "mozilla/NullPrincipal.h" #include "nsIHttpHeaderVisitor.h" #include "nsQueryObject.h" #include diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 2162ca8b2fa9..f9e7e01a2dfc 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -95,7 +95,6 @@ #include "nsIHttpPushListener.h" #include "nsIX509Cert.h" #include "ScopedNSSTypes.h" -#include "NullPrincipal.h" #include "nsIDeprecationWarner.h" #include "nsIDocument.h" #include "nsICompressConvStats.h" @@ -104,6 +103,7 @@ #include "mozilla/extensions/StreamFilterParent.h" #include "mozilla/net/Predictor.h" #include "mozilla/MathAlgorithms.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/StaticPrefs.h" #include "CacheControlParser.h" #include "nsMixedContentBlocker.h" diff --git a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp index cfc021ae90ec..3839bc142169 100644 --- a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp +++ b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp @@ -11,10 +11,10 @@ #include "nsContentUtils.h" #include "nsIHttpHeaderVisitor.h" #include "nsContentSecurityManager.h" -#include "NullPrincipal.h" #include "nsServiceManagerUtils.h" #include "nsIInputStreamChannel.h" #include "mozilla/DebugOnly.h" +#include "mozilla/NullPrincipal.h" NS_IMPL_ADDREF(nsViewSourceChannel) NS_IMPL_RELEASE(nsViewSourceChannel) @@ -67,7 +67,8 @@ nsViewSourceChannel::Init(nsIURI* uri) // Until then we follow the principal of least privilege and use // nullPrincipal as the loadingPrincipal and the least permissive // securityflag. - nsCOMPtr nullPrincipal = NullPrincipal::CreateWithoutOriginAttributes(); + nsCOMPtr nullPrincipal = + mozilla::NullPrincipal::CreateWithoutOriginAttributes(); rv = pService->NewChannel2(path, nullptr, // aOriginCharset diff --git a/parser/html/nsParserUtils.cpp b/parser/html/nsParserUtils.cpp index 25ecafdbedf0..add1fd10417f 100644 --- a/parser/html/nsParserUtils.cpp +++ b/parser/html/nsParserUtils.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsParserUtils.h" -#include "NullPrincipal.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/dom/DocumentFragment.h" #include "mozilla/dom/Element.h" #include "mozilla/dom/ScriptLoader.h" @@ -66,7 +66,8 @@ nsParserUtils::Sanitize(const nsAString& aFromStr, { nsCOMPtr uri; NS_NewURI(getter_AddRefs(uri), "about:blank"); - nsCOMPtr principal = NullPrincipal::CreateWithoutOriginAttributes(); + nsCOMPtr principal = + mozilla::NullPrincipal::CreateWithoutOriginAttributes(); nsCOMPtr document; nsresult rv = NS_NewDOMDocument(getter_AddRefs(document), EmptyString(), diff --git a/parser/htmlparser/nsExpatDriver.cpp b/parser/htmlparser/nsExpatDriver.cpp index 9bd833be2e35..6d876f93e2e5 100644 --- a/parser/htmlparser/nsExpatDriver.cpp +++ b/parser/htmlparser/nsExpatDriver.cpp @@ -25,7 +25,7 @@ #include "nsXPCOMCIDInternal.h" #include "nsUnicharInputStream.h" #include "nsContentUtils.h" -#include "NullPrincipal.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/Logging.h" @@ -680,7 +680,7 @@ nsExpatDriver::OpenInputStreamFromExternalDTD(const char16_t* aFPIStr, } } if (!loadingPrincipal) { - loadingPrincipal = NullPrincipal::CreateWithoutOriginAttributes(); + loadingPrincipal = mozilla::NullPrincipal::CreateWithoutOriginAttributes(); } rv = NS_NewChannel(getter_AddRefs(channel), uri, diff --git a/parser/xml/nsSAXXMLReader.cpp b/parser/xml/nsSAXXMLReader.cpp index 458e3c6c574a..8dfcca875d98 100644 --- a/parser/xml/nsSAXXMLReader.cpp +++ b/parser/xml/nsSAXXMLReader.cpp @@ -6,10 +6,10 @@ #include "nsSAXXMLReader.h" #include "mozilla/Encoding.h" +#include "mozilla/NullPrincipal.h" #include "nsIInputStream.h" #include "nsNetCID.h" #include "nsNetUtil.h" -#include "NullPrincipal.h" #include "nsIParser.h" #include "nsParserCIID.h" #include "nsStreamUtils.h" diff --git a/toolkit/components/places/nsFaviconService.cpp b/toolkit/components/places/nsFaviconService.cpp index a37a8bf5746e..62f4c5601138 100644 --- a/toolkit/components/places/nsFaviconService.cpp +++ b/toolkit/components/places/nsFaviconService.cpp @@ -26,11 +26,11 @@ #include "nsIClassInfoImpl.h" #include "mozilla/ArrayUtils.h" #include "mozilla/LoadInfo.h" +#include "mozilla/NullPrincipal.h" #include "mozilla/Preferences.h" #include "nsILoadInfo.h" #include "nsIContentPolicy.h" #include "nsContentUtils.h" -#include "NullPrincipal.h" #include "imgICache.h" #define UNASSOCIATED_FAVICONS_LENGTH 32 diff --git a/xpfe/appshell/nsContentTreeOwner.cpp b/xpfe/appshell/nsContentTreeOwner.cpp index 88d799a594a5..e3bfe6bdf7f5 100644 --- a/xpfe/appshell/nsContentTreeOwner.cpp +++ b/xpfe/appshell/nsContentTreeOwner.cpp @@ -31,8 +31,8 @@ #include "nsIMIMEInfo.h" #include "nsIWidget.h" #include "nsWindowWatcher.h" -#include "NullPrincipal.h" #include "mozilla/BrowserElementParent.h" +#include "mozilla/NullPrincipal.h" #include "nsDocShellLoadInfo.h" #include "nsIScriptObjectPrincipal.h"