Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset a70b549ac35d (bug 1347817) for failing test_websocket-transport.html on OSX 10.10 debug. r=backout

Browse Source
This commit is contained in:
Sebastian Hengst 2017-03-29 11:18:41 +02:00
parent 2d288e10b9
commit 65459a7f0a
10 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
caps/BasePrincipal.cpp
View File

@ -55,7 +55,7 @@ BasePrincipal::GetOriginNoSuffix(nsACString& aOrigin)
if (mOriginNoSuffix) {
return mOriginNoSuffix->ToUTF8String(aOrigin);
}
return GetOriginNoSuffixInternal(aOrigin);
return GetOriginInternal(aOrigin);
}
bool
@ -465,10 +465,10 @@ BasePrincipal::FinishInit()
// Then compute the origin without the suffix.
nsAutoCString originNoSuffix;
nsresult rv = GetOriginNoSuffixInternal(originNoSuffix);
nsresult rv = GetOriginInternal(originNoSuffix);
if (NS_FAILED(rv)) {
// If GetOriginNoSuffixInternal fails, we will get a null atom for
// mOriginNoSuffix, which we deal with anywhere mOriginNoSuffix is used.
// If GetOriginInternal fails, we will get a null atom for mOriginNoSuffix,
// which we deal with anywhere mOriginNoSuffix is used.
// Once this is made infallible we can remove those null checks.
mOriginNoSuffix = nullptr;
return;

2
caps/BasePrincipal.h
View File

@ -104,7 +104,7 @@ public:
protected:
virtual ~BasePrincipal();
virtual nsresult GetOriginNoSuffixInternal(nsACString& aOrigin) = 0;
virtual nsresult GetOriginInternal(nsACString& aOrigin) = 0;
// Note that this does not check OriginAttributes. Callers that depend on
// those must call Subsumes instead.
virtual bool SubsumesInternal(nsIPrincipal* aOther, DocumentDomainConsideration aConsider) = 0;

2
caps/ContentPrincipal.cpp
View File

@ -132,7 +132,7 @@ ContentPrincipal::GetScriptLocation(nsACString &aStr)
}
nsresult
ContentPrincipal::GetOriginNoSuffixInternal(nsACString& aOrigin)
ContentPrincipal::GetOriginInternal(nsACString& aOrigin)
{
if (!mCodebase) {
return NS_ERROR_FAILURE;

2
caps/ContentPrincipal.h
View File

@ -27,7 +27,7 @@ public:
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
NS_IMETHOD GetAddonId(nsAString& aAddonId) override;
bool IsCodebasePrincipal() const override { return true; }
nsresult GetOriginNoSuffixInternal(nsACString& aOrigin) override;
nsresult GetOriginInternal(nsACString& aOrigin) override;
ContentPrincipal();

2
caps/ExpandedPrincipal.cpp
View File

@ -82,7 +82,7 @@ ExpandedPrincipal::SetDomain(nsIURI* aDomain)
}
nsresult
ExpandedPrincipal::GetOriginNoSuffixInternal(nsACString& aOrigin)
ExpandedPrincipal::GetOriginInternal(nsACString& aOrigin)
{
aOrigin.AssignLiteral("[Expanded Principal [");
for (size_t i = 0; i < mPrincipals.Length(); ++i) {

2
caps/ExpandedPrincipal.h
View File

@ -37,7 +37,7 @@ public:
NS_IMETHOD GetAddonId(nsAString& aAddonId) override;
virtual bool AddonHasPermission(const nsAString& aPerm) override;
virtual nsresult GetScriptLocation(nsACString &aStr) override;
nsresult GetOriginNoSuffixInternal(nsACString& aOrigin) override;
nsresult GetOriginInternal(nsACString& aOrigin) override;
protected:
virtual ~ExpandedPrincipal();

2
caps/NullPrincipal.cpp
View File

@ -144,7 +144,7 @@ NullPrincipal::SetDomain(nsIURI* aDomain)
}
nsresult
NullPrincipal::GetOriginNoSuffixInternal(nsACString& aOrigin)
NullPrincipal::GetOriginInternal(nsACString& aOrigin)
{
return mURI->GetSpec(aOrigin);
}

2
caps/NullPrincipal.h
View File

@ -51,7 +51,7 @@ public:
NS_IMETHOD SetDomain(nsIURI* aDomain) override;
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
NS_IMETHOD GetAddonId(nsAString& aAddonId) override;
nsresult GetOriginNoSuffixInternal(nsACString& aOrigin) override;
nsresult GetOriginInternal(nsACString& aOrigin) override;
static already_AddRefed<NullPrincipal> CreateWithInheritedAttributes(nsIPrincipal* aInheritFrom);

2
caps/SystemPrincipal.cpp
View File

@ -65,7 +65,7 @@ SystemPrincipal::GetURI(nsIURI** aURI)
}
nsresult
SystemPrincipal::GetOriginNoSuffixInternal(nsACString& aOrigin)
SystemPrincipal::GetOriginInternal(nsACString& aOrigin)
{
aOrigin.AssignLiteral(SYSTEM_PRINCIPAL_SPEC);
return NS_OK;

2
caps/SystemPrincipal.h
View File

@ -43,7 +43,7 @@ public:
NS_IMETHOD EnsurePreloadCSP(nsIDOMDocument* aDocument, nsIContentSecurityPolicy** aCSP) override;
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
NS_IMETHOD GetAddonId(nsAString& aAddonId) override;
nsresult GetOriginNoSuffixInternal(nsACString& aOrigin) override;
nsresult GetOriginInternal(nsACString& aOrigin) override;
virtual nsresult GetScriptLocation(nsACString &aStr) override;