Stop building /caps unified and fix deprot.

Tag #80
pull/7/head
wolfbeast 3 years ago committed by Roy Tam
parent 64cab879b4
commit f472fe68d0
  1. 5
      caps/moz.build
  2. 2
      caps/nsJSPrincipals.cpp
  3. 2
      caps/nsNullPrincipal.cpp
  4. 6
      caps/nsNullPrincipalURI.cpp
  5. 2
      caps/nsPrincipal.cpp
  6. 2
      caps/nsScriptSecurityManager.cpp

@ -34,12 +34,7 @@ EXPORTS.mozilla = [
]
SOURCES += [
# Compile this separately since nsExceptionHandler.h conflicts
# with something from nsNullPrincipal.cpp.
'BasePrincipal.cpp',
]
UNIFIED_SOURCES += [
'DomainPolicy.cpp',
'nsJSPrincipals.cpp',
'nsNullPrincipal.cpp',

@ -15,6 +15,7 @@
#include "nsMemory.h"
#include "nsStringBuffer.h"
#include "mozilla/ipc/PBackgroundSharedTypes.h"
#include "mozilla/dom/StructuredCloneTags.h"
// for mozilla::dom::workers::kJSPrincipalsDebugToken
#include "mozilla/dom/workers/Workers.h"
@ -22,6 +23,7 @@
using namespace mozilla;
using namespace mozilla::ipc;
using namespace mozilla::dom;
NS_IMETHODIMP_(MozExternalRefCountType)
nsJSPrincipals::AddRef()

@ -20,6 +20,8 @@
#include "nsIClassInfoImpl.h"
#include "nsNetCID.h"
#include "nsError.h"
#include "nsIObjectInputStream.h"
#include "nsIObjectOutputStream.h"
#include "nsIScriptSecurityManager.h"
#include "nsPrincipal.h"
#include "nsScriptSecurityManager.h"

@ -6,8 +6,12 @@
#include "nsNullPrincipalURI.h"
#include "mozilla/ArrayUtils.h"
#include "mozilla/DebugOnly.h"
#include "mozilla/MemoryReporting.h"
#include "mozilla/Services.h"
#include "mozilla/Unused.h"
#include "mozilla/ipc/URIParams.h"
@ -15,6 +19,8 @@
#include "nsCRT.h"
#include "nsIUUIDGenerator.h"
using namespace mozilla;
////////////////////////////////////////////////////////////////////////////////
//// nsNullPrincipalURI

@ -19,6 +19,8 @@
#include "nsJSPrincipals.h"
#include "nsIEffectiveTLDService.h"
#include "nsIClassInfoImpl.h"
#include "nsIObjectInputStream.h"
#include "nsIObjectOutputStream.h"
#include "nsIProtocolHandler.h"
#include "nsError.h"
#include "nsIContentSecurityPolicy.h"

@ -59,6 +59,7 @@
#include "mozIApplication.h"
#include "mozilla/Preferences.h"
#include "mozilla/dom/BindingUtils.h"
#include "mozilla/dom/ContentParent.h"
#include <stdint.h>
#include "mozilla/dom/ScriptSettings.h"
#include "mozilla/ClearOnShutdown.h"
@ -70,6 +71,7 @@
using namespace mozilla;
using namespace mozilla::dom;
using namespace mozilla::ipc;
nsIIOService *nsScriptSecurityManager::sIOService = nullptr;
nsIStringBundle *nsScriptSecurityManager::sStrBundle = nullptr;

Loading…
Cancel
Save