Backed out 8 changesets (bug 1915355) for causing xpcshell failures.
Backed out changeset d292c3a2592d (bug 1915355) Backed out changeset 3386ee00459e (bug 1915355) Backed out changeset 98848e63dfbf (bug 1915355) Backed out changeset b668d0c685e8 (bug 1915355) Backed out changeset 08acd8256071 (bug 1915355) Backed out changeset 3ae9463ee988 (bug 1915355) Backed out changeset 2dd416f1b847 (bug 1915355) Backed out changeset 17107bbcf8c8 (bug 1915355)
This commit is contained in:
@@ -61,7 +61,7 @@ static void PopulateTopLevelInfoFromURI(const bool aIsTopLevelDocument,
|
||||
bool aForeignByAncestorContext,
|
||||
bool aIsFirstPartyEnabled, bool aForced,
|
||||
bool aUseSite,
|
||||
nsString OriginAttributes::* aTarget,
|
||||
nsString OriginAttributes::*aTarget,
|
||||
OriginAttributes& aOriginAttributes) {
|
||||
nsresult rv;
|
||||
|
||||
@@ -514,23 +514,4 @@ bool OriginAttributes::ParsePartitionKey(const nsAString& aPartitionKey,
|
||||
return fieldIndex > 1;
|
||||
}
|
||||
|
||||
/* static */
|
||||
bool OriginAttributes::ExtractSiteFromPartitionKey(
|
||||
const nsAString& aPartitionKey, nsAString& aOutSite) {
|
||||
nsAutoString scheme, host;
|
||||
int32_t port;
|
||||
bool unused;
|
||||
if (!ParsePartitionKey(aPartitionKey, scheme, host, port, unused)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (port == -1) {
|
||||
aOutSite.Assign(scheme + u"://"_ns + host);
|
||||
} else {
|
||||
aOutSite.Assign(scheme + u"://"_ns + host + u":"_ns);
|
||||
aOutSite.AppendInt(port);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace mozilla
|
||||
|
||||
@@ -141,11 +141,6 @@ class OriginAttributes : public dom::OriginAttributesDictionary {
|
||||
nsAString& outScheme, nsAString& outBaseDomain,
|
||||
int32_t& outPort,
|
||||
bool& outForeignByAncestorContext);
|
||||
|
||||
// Parse a partitionKey and extract the site from it. Returns false if the
|
||||
// partitionKey cannot be parsed because the format is invalid.
|
||||
static bool ExtractSiteFromPartitionKey(const nsAString& aPartitionKey,
|
||||
nsAString& aOutSite);
|
||||
};
|
||||
|
||||
class OriginAttributesPattern : public dom::OriginAttributesPatternDictionary {
|
||||
|
||||
Reference in New Issue
Block a user