nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1476306 - Moving NullPrincipal/ContentPrincipal/SystemPrincipal under mozilla namespace - part 2 - SystemPrincipal, r=ckerschb

Browse source
This commit is contained in:
Andrea Marchesini 2018-07-17 21:38:19 +02:00
parent a053cf1c15
commit 58f78c6f5d
8 changed files with 16 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
caps/SystemPrincipal.cpp
View file

@ -18,6 +18,8 @@
#include "nsIScriptSecurityManager.h" #include "nsIScriptSecurityManager.h"
#include "pratom.h" #include "pratom.h"
using namespace mozilla;
NS_IMPL_CLASSINFO(SystemPrincipal, nullptr, NS_IMPL_CLASSINFO(SystemPrincipal, nullptr,
nsIClassInfo::SINGLETON | nsIClassInfo::MAIN_THREAD_ONLY, nsIClassInfo::SINGLETON | nsIClassInfo::MAIN_THREAD_ONLY,
NS_SYSTEMPRINCIPAL_CID) NS_SYSTEMPRINCIPAL_CID)

11
caps/SystemPrincipal.h
View file

@ -6,8 +6,8 @@
/* The privileged system principal. */ /* The privileged system principal. */
#ifndef SystemPrincipal_h #ifndef mozilla_SystemPrincipal_h
#define SystemPrincipal_h #define mozilla_SystemPrincipal_h
#include "nsIPrincipal.h" #include "nsIPrincipal.h"
#include "nsJSPrincipals.h" #include "nsJSPrincipals.h"
@ -19,8 +19,9 @@
{ 0xb7, 0x65, 0x0, 0x60, 0xb0, 0xb6, 0xce, 0xcb }} { 0xb7, 0x65, 0x0, 0x60, 0xb0, 0xb6, 0xce, 0xcb }}
#define NS_SYSTEMPRINCIPAL_CONTRACTID "@mozilla.org/systemprincipal;1" #define NS_SYSTEMPRINCIPAL_CONTRACTID "@mozilla.org/systemprincipal;1"
namespace mozilla {
class SystemPrincipal final : public mozilla::BasePrincipal class SystemPrincipal final : public BasePrincipal
{ {
SystemPrincipal() SystemPrincipal()
: BasePrincipal(eSystemPrincipal) : BasePrincipal(eSystemPrincipal)
@ -63,4 +64,6 @@ protected:
} }
}; };
#endif // SystemPrincipal_h } // mozilla namespace
#endif // mozilla_SystemPrincipal_h

2
caps/moz.build
View file

@ -27,7 +27,6 @@ EXPORTS += [
'ContentPrincipal.h', 'ContentPrincipal.h',
'nsJSPrincipals.h', 'nsJSPrincipals.h',
'nsScriptSecurityManager.h', 'nsScriptSecurityManager.h',
'SystemPrincipal.h',
] ]
EXPORTS.mozilla = [ EXPORTS.mozilla = [
@ -35,6 +34,7 @@ EXPORTS.mozilla = [
'NullPrincipal.h', 'NullPrincipal.h',
'NullPrincipalURI.h', 'NullPrincipalURI.h',
'OriginAttributes.h', 'OriginAttributes.h',
'SystemPrincipal.h',
] ]
SOURCES += [ SOURCES += [

4
caps/nsScriptSecurityManager.h
View file

@ -21,10 +21,10 @@
class nsIIOService; class nsIIOService;
class nsIStringBundle; class nsIStringBundle;
class SystemPrincipal;
namespace mozilla { namespace mozilla {
class OriginAttributes; class OriginAttributes;
class SystemPrincipal;
} // namespace mozilla } // namespace mozilla
///////////////////////////// /////////////////////////////
@ -50,7 +50,7 @@ public:
// Invoked exactly once, by XPConnect. // Invoked exactly once, by XPConnect.
static void InitStatics(); static void InitStatics();
static already_AddRefed<SystemPrincipal> static already_AddRefed<mozilla::SystemPrincipal>
SystemPrincipalSingletonConstructor(); SystemPrincipalSingletonConstructor();
/** /**

2
js/xpconnect/loader/mozJSSubScriptLoader.cpp
View file

@ -16,7 +16,6 @@
#include "nsNetUtil.h" #include "nsNetUtil.h"
#include "nsIFileURL.h" #include "nsIFileURL.h"
#include "ContentPrincipal.h" #include "ContentPrincipal.h"
#include "SystemPrincipal.h"
#include "jsapi.h" #include "jsapi.h"
#include "jsfriendapi.h" #include "jsfriendapi.h"
@ -28,6 +27,7 @@
#include "mozilla/dom/ScriptLoader.h" #include "mozilla/dom/ScriptLoader.h"
#include "mozilla/HoldDropJSObjects.h" #include "mozilla/HoldDropJSObjects.h"
#include "mozilla/ScriptPreloader.h" #include "mozilla/ScriptPreloader.h"
#include "mozilla/SystemPrincipal.h"
#include "mozilla/scache/StartupCache.h" #include "mozilla/scache/StartupCache.h"
#include "mozilla/scache/StartupCacheUtils.h" #include "mozilla/scache/StartupCacheUtils.h"
#include "mozilla/Unused.h" #include "mozilla/Unused.h"

2
js/xpconnect/src/XPCJSContext.cpp
View file

@ -48,6 +48,7 @@
#include "mozilla/Attributes.h" #include "mozilla/Attributes.h"
#include "mozilla/ProcessHangMonitor.h" #include "mozilla/ProcessHangMonitor.h"
#include "mozilla/Sprintf.h" #include "mozilla/Sprintf.h"
#include "mozilla/SystemPrincipal.h"
#include "mozilla/ThreadLocal.h" #include "mozilla/ThreadLocal.h"
#include "mozilla/UniquePtrExtensions.h" #include "mozilla/UniquePtrExtensions.h"
#include "mozilla/Unused.h" #include "mozilla/Unused.h"
@ -60,7 +61,6 @@
#include "nsIXULRuntime.h" #include "nsIXULRuntime.h"
#include "nsJSPrincipals.h" #include "nsJSPrincipals.h"
#include "ExpandedPrincipal.h" #include "ExpandedPrincipal.h"
#include "SystemPrincipal.h"
#if defined(XP_LINUX) && !defined(ANDROID) #if defined(XP_LINUX) && !defined(ANDROID)
// For getrlimit and min/max. // For getrlimit and min/max.

2
layout/build/nsLayoutModule.cpp
View file

@ -101,8 +101,8 @@ using mozilla::dom::AudioChannelAgent;
#include "nsScriptSecurityManager.h" #include "nsScriptSecurityManager.h"
#include "ContentPrincipal.h" #include "ContentPrincipal.h"
#include "ExpandedPrincipal.h" #include "ExpandedPrincipal.h"
#include "SystemPrincipal.h"
#include "mozilla/NullPrincipal.h" #include "mozilla/NullPrincipal.h"
#include "mozilla/SystemPrincipal.h"
#include "nsNetCID.h" #include "nsNetCID.h"
#if defined(MOZ_WIDGET_ANDROID) #if defined(MOZ_WIDGET_ANDROID)
#include "nsHapticFeedback.h" #include "nsHapticFeedback.h"

2
toolkit/components/extensions/webrequest/ChannelWrapper.cpp
View file

@ -10,7 +10,7 @@
#include "xpcpublic.h" #include "xpcpublic.h"
#include "mozilla/BasePrincipal.h" #include "mozilla/BasePrincipal.h"
#include "SystemPrincipal.h" #include "mozilla/SystemPrincipal.h"
#include "NSSErrorsService.h" #include "NSSErrorsService.h"
#include "nsITransportSecurityInfo.h" #include "nsITransportSecurityInfo.h"