wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-27 01:27:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into custom

Browse source
This commit is contained in:
roytam1 2020-09-16 21:19:55 +08:00
commit 8fd5fd8690
8 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/palemoon/components/nsBrowserGlue.js
View file

@ -452,7 +452,7 @@ BrowserGlue.prototype = {
Services.obs.notifyObservers(null, "browser-ui-startup-complete", ""); Services.obs.notifyObservers(null, "browser-ui-startup-complete", "");
}, },
// Copies additional profile files from the default profile tho the current profile. // Copies additional profile files from the default profile to the current profile.
// Only files not covered by the regular profile creation process. // Only files not covered by the regular profile creation process.
// Currently only the userchrome examples. // Currently only the userchrome examples.
_copyDefaultProfileFiles: function() _copyDefaultProfileFiles: function()

12
layout/style/Loader.cpp
View file

@ -2273,7 +2273,6 @@ Loader::LoadChildSheet(StyleSheet* aParentSheet,
state = eSheetComplete; state = eSheetComplete;
} else { } else {
bool isAlternate; bool isAlternate;
bool isExplicitlyEnabled;
const nsSubstring& empty = EmptyString(); const nsSubstring& empty = EmptyString();
// For now, use CORS_NONE for child sheets // For now, use CORS_NONE for child sheets
rv = CreateSheet(aURL, nullptr, principal, rv = CreateSheet(aURL, nullptr, principal,
@ -2283,8 +2282,9 @@ Loader::LoadChildSheet(StyleSheet* aParentSheet,
parentData ? parentData->mSyncLoad : false, parentData ? parentData->mSyncLoad : false,
false, empty, state, &isAlternate, &sheet); false, empty, state, &isAlternate, &sheet);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
// For now, child sheets are not explicitly enabled (seventh argument is
PrepareSheet(sheet, empty, empty, aMedia, nullptr, isAlternate, isExplicitlyEnabled); // always false here).
PrepareSheet(sheet, empty, empty, aMedia, nullptr, isAlternate, false);
} }
rv = InsertChildSheet(sheet, aParentSheet, aParentRule); rv = InsertChildSheet(sheet, aParentSheet, aParentRule);
@ -2397,7 +2397,6 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
StyleSheetState state; StyleSheetState state;
bool isAlternate; bool isAlternate;
bool isExplicitlyEnabled;
RefPtr<StyleSheet> sheet; RefPtr<StyleSheet> sheet;
bool syncLoad = (aObserver == nullptr); bool syncLoad = (aObserver == nullptr);
const nsSubstring& empty = EmptyString(); const nsSubstring& empty = EmptyString();
@ -2407,7 +2406,10 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
false, empty, state, &isAlternate, &sheet); false, empty, state, &isAlternate, &sheet);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
PrepareSheet(sheet, empty, empty, nullptr, nullptr, isAlternate, isExplicitlyEnabled); // Sheets can only be explicitly enabled after creation and preparation, so
// we always pass false for the initial value of the explicitly enabled flag
// when calling PrepareSheet.
PrepareSheet(sheet, empty, empty, nullptr, nullptr, isAlternate, false);
if (state == eSheetComplete) { if (state == eSheetComplete) {
LOG((" Sheet already complete")); LOG((" Sheet already complete"));

2
layout/svg/nsCSSClipPathInstance.cpp
View file

@ -59,7 +59,7 @@ nsCSSClipPathInstance::HitTestBasicShapeClip(nsIFrame* aFrame,
RefPtr<Path> path = instance.CreateClipPath(drawTarget); RefPtr<Path> path = instance.CreateClipPath(drawTarget);
float pixelRatio = float(nsPresContext::AppUnitsPerCSSPixel()) / float pixelRatio = float(nsPresContext::AppUnitsPerCSSPixel()) /
aFrame->PresContext()->AppUnitsPerDevPixel(); aFrame->PresContext()->AppUnitsPerDevPixel();
return path->ContainsPoint(ToPoint(aPoint) * pixelRatio, Matrix()); return path ? path->ContainsPoint(ToPoint(aPoint) * pixelRatio, Matrix()) : false;
} }
already_AddRefed<Path> already_AddRefed<Path>

23
security/certverifier/CertVerifier.cpp
View file

@ -422,7 +422,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage,
SHA1Mode::Allowed, SHA1Mode::Allowed,
NetscapeStepUpPolicy::NeverMatch, NetscapeStepUpPolicy::NeverMatch,
originAttributes, originAttributes,
builtChain, nullptr); builtChain);
rv = BuildCertChain(trustDomain, certDER, time, rv = BuildCertChain(trustDomain, certDER, time,
EndEntityOrCA::MustBeEndEntity, EndEntityOrCA::MustBeEndEntity,
KeyUsage::digitalSignature, KeyUsage::digitalSignature,
@ -489,8 +489,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage,
mCertShortLifetimeInDays, mPinningMode, MIN_RSA_BITS, mCertShortLifetimeInDays, mPinningMode, MIN_RSA_BITS,
ValidityCheckingMode::CheckForEV, ValidityCheckingMode::CheckForEV,
sha1ModeConfigurations[i], mNetscapeStepUpPolicy, sha1ModeConfigurations[i], mNetscapeStepUpPolicy,
originAttributes, builtChain, originAttributes, builtChain);
hostname);
rv = BuildCertChainForOneKeyUsage(trustDomain, certDER, time, rv = BuildCertChainForOneKeyUsage(trustDomain, certDER, time,
KeyUsage::digitalSignature,// (EC)DHE KeyUsage::digitalSignature,// (EC)DHE
KeyUsage::keyEncipherment, // RSA KeyUsage::keyEncipherment, // RSA
@ -572,8 +571,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage,
ValidityCheckingMode::CheckingOff, ValidityCheckingMode::CheckingOff,
sha1ModeConfigurations[j], sha1ModeConfigurations[j],
mNetscapeStepUpPolicy, mNetscapeStepUpPolicy,
originAttributes, builtChain, originAttributes, builtChain);
hostname);
rv = BuildCertChainForOneKeyUsage(trustDomain, certDER, time, rv = BuildCertChainForOneKeyUsage(trustDomain, certDER, time,
KeyUsage::digitalSignature,//(EC)DHE KeyUsage::digitalSignature,//(EC)DHE
KeyUsage::keyEncipherment,//RSA KeyUsage::keyEncipherment,//RSA
@ -635,7 +633,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage,
pinningDisabled, MIN_RSA_BITS_WEAK, pinningDisabled, MIN_RSA_BITS_WEAK,
ValidityCheckingMode::CheckingOff, ValidityCheckingMode::CheckingOff,
SHA1Mode::Allowed, mNetscapeStepUpPolicy, SHA1Mode::Allowed, mNetscapeStepUpPolicy,
originAttributes, builtChain, nullptr); originAttributes, builtChain);
rv = BuildCertChain(trustDomain, certDER, time, rv = BuildCertChain(trustDomain, certDER, time,
EndEntityOrCA::MustBeCA, KeyUsage::keyCertSign, EndEntityOrCA::MustBeCA, KeyUsage::keyCertSign,
KeyPurposeId::id_kp_serverAuth, KeyPurposeId::id_kp_serverAuth,
@ -651,7 +649,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage,
ValidityCheckingMode::CheckingOff, ValidityCheckingMode::CheckingOff,
SHA1Mode::Allowed, SHA1Mode::Allowed,
NetscapeStepUpPolicy::NeverMatch, NetscapeStepUpPolicy::NeverMatch,
originAttributes, builtChain, nullptr); originAttributes, builtChain);
rv = BuildCertChain(trustDomain, certDER, time, rv = BuildCertChain(trustDomain, certDER, time,
EndEntityOrCA::MustBeEndEntity, EndEntityOrCA::MustBeEndEntity,
KeyUsage::digitalSignature, KeyUsage::digitalSignature,
@ -678,7 +676,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage,
ValidityCheckingMode::CheckingOff, ValidityCheckingMode::CheckingOff,
SHA1Mode::Allowed, SHA1Mode::Allowed,
NetscapeStepUpPolicy::NeverMatch, NetscapeStepUpPolicy::NeverMatch,
originAttributes, builtChain, nullptr); originAttributes, builtChain);
rv = BuildCertChain(trustDomain, certDER, time, rv = BuildCertChain(trustDomain, certDER, time,
EndEntityOrCA::MustBeEndEntity, EndEntityOrCA::MustBeEndEntity,
KeyUsage::keyEncipherment, // RSA KeyUsage::keyEncipherment, // RSA
@ -702,7 +700,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage,
ValidityCheckingMode::CheckingOff, ValidityCheckingMode::CheckingOff,
SHA1Mode::Allowed, SHA1Mode::Allowed,
NetscapeStepUpPolicy::NeverMatch, NetscapeStepUpPolicy::NeverMatch,
originAttributes, builtChain, nullptr); originAttributes, builtChain);
rv = BuildCertChain(trustDomain, certDER, time, rv = BuildCertChain(trustDomain, certDER, time,
EndEntityOrCA::MustBeEndEntity, EndEntityOrCA::MustBeEndEntity,
KeyUsage::digitalSignature, KeyUsage::digitalSignature,
@ -735,7 +733,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage,
ValidityCheckingMode::CheckingOff, ValidityCheckingMode::CheckingOff,
SHA1Mode::Allowed, SHA1Mode::Allowed,
NetscapeStepUpPolicy::NeverMatch, NetscapeStepUpPolicy::NeverMatch,
originAttributes, builtChain, nullptr); originAttributes, builtChain);
rv = BuildCertChain(sslTrust, certDER, time, endEntityOrCA, rv = BuildCertChain(sslTrust, certDER, time, endEntityOrCA,
keyUsage, eku, CertPolicyId::anyPolicy, keyUsage, eku, CertPolicyId::anyPolicy,
stapledOCSPResponse); stapledOCSPResponse);
@ -747,7 +745,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage,
ValidityCheckingMode::CheckingOff, ValidityCheckingMode::CheckingOff,
SHA1Mode::Allowed, SHA1Mode::Allowed,
NetscapeStepUpPolicy::NeverMatch, NetscapeStepUpPolicy::NeverMatch,
originAttributes, builtChain, nullptr); originAttributes, builtChain);
rv = BuildCertChain(emailTrust, certDER, time, endEntityOrCA, rv = BuildCertChain(emailTrust, certDER, time, endEntityOrCA,
keyUsage, eku, CertPolicyId::anyPolicy, keyUsage, eku, CertPolicyId::anyPolicy,
stapledOCSPResponse); stapledOCSPResponse);
@ -761,8 +759,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage,
ValidityCheckingMode::CheckingOff, ValidityCheckingMode::CheckingOff,
SHA1Mode::Allowed, SHA1Mode::Allowed,
NetscapeStepUpPolicy::NeverMatch, NetscapeStepUpPolicy::NeverMatch,
originAttributes, builtChain, originAttributes, builtChain);
nullptr);
rv = BuildCertChain(objectSigningTrust, certDER, time, rv = BuildCertChain(objectSigningTrust, certDER, time,
endEntityOrCA, keyUsage, eku, endEntityOrCA, keyUsage, eku,
CertPolicyId::anyPolicy, stapledOCSPResponse); CertPolicyId::anyPolicy, stapledOCSPResponse);

4
security/certverifier/NSSCertDBTrustDomain.cpp
View file

@ -58,8 +58,7 @@ NSSCertDBTrustDomain::NSSCertDBTrustDomain(SECTrustType certDBTrustType,
CertVerifier::SHA1Mode sha1Mode, CertVerifier::SHA1Mode sha1Mode,
NetscapeStepUpPolicy netscapeStepUpPolicy, NetscapeStepUpPolicy netscapeStepUpPolicy,
const NeckoOriginAttributes& originAttributes, const NeckoOriginAttributes& originAttributes,
UniqueCERTCertList& builtChain, UniqueCERTCertList& builtChain)
/*optional*/ const char* hostname)
: mCertDBTrustType(certDBTrustType) : mCertDBTrustType(certDBTrustType)
, mOCSPFetching(ocspFetching) , mOCSPFetching(ocspFetching)
, mOCSPCache(ocspCache) , mOCSPCache(ocspCache)
@ -73,7 +72,6 @@ NSSCertDBTrustDomain::NSSCertDBTrustDomain(SECTrustType certDBTrustType,
, mNetscapeStepUpPolicy(netscapeStepUpPolicy) , mNetscapeStepUpPolicy(netscapeStepUpPolicy)
, mOriginAttributes(originAttributes) , mOriginAttributes(originAttributes)
, mBuiltChain(builtChain) , mBuiltChain(builtChain)
, mHostname(hostname)
, mCertBlocklist(do_GetService(NS_CERTBLOCKLIST_CONTRACTID)) , mCertBlocklist(do_GetService(NS_CERTBLOCKLIST_CONTRACTID))
, mOCSPStaplingStatus(CertVerifier::OCSP_STAPLING_NEVER_CHECKED) , mOCSPStaplingStatus(CertVerifier::OCSP_STAPLING_NEVER_CHECKED)
, mSCTListFromCertificate() , mSCTListFromCertificate()

4
security/certverifier/NSSCertDBTrustDomain.h
View file

@ -83,8 +83,7 @@ public:
CertVerifier::SHA1Mode sha1Mode, CertVerifier::SHA1Mode sha1Mode,
NetscapeStepUpPolicy netscapeStepUpPolicy, NetscapeStepUpPolicy netscapeStepUpPolicy,
const NeckoOriginAttributes& originAttributes, const NeckoOriginAttributes& originAttributes,
UniqueCERTCertList& builtChain, UniqueCERTCertList& builtChain);
/*optional*/ const char* hostname = nullptr);
virtual Result FindIssuer(mozilla::pkix::Input encodedIssuerName, virtual Result FindIssuer(mozilla::pkix::Input encodedIssuerName,
IssuerChecker& checker, IssuerChecker& checker,
@ -187,7 +186,6 @@ private:
NetscapeStepUpPolicy mNetscapeStepUpPolicy; NetscapeStepUpPolicy mNetscapeStepUpPolicy;
const NeckoOriginAttributes& mOriginAttributes; const NeckoOriginAttributes& mOriginAttributes;
UniqueCERTCertList& mBuiltChain; // non-owning UniqueCERTCertList& mBuiltChain; // non-owning
const char* mHostname; // non-owning - only used for pinning checks
nsCOMPtr<nsICertBlocklist> mCertBlocklist; nsCOMPtr<nsICertBlocklist> mCertBlocklist;
CertVerifier::OCSPStaplingStatus mOCSPStaplingStatus; CertVerifier::OCSPStaplingStatus mOCSPStaplingStatus;
// Certificate Transparency data extracted during certificate verification // Certificate Transparency data extracted during certificate verification

4
widget/cocoa/nsDragService.mm
View file

@ -222,7 +222,7 @@ nsDragService::ConstructDragImage(nsIDOMNode* aDOMNode,
bool bool
nsDragService::IsValidType(NSString* availableType, bool allowFileURL) nsDragService::IsValidType(NSString* availableType, bool allowFileURL)
{ {
NS_OBJC_BEGIN_TRY_ABORT_BLOCK; NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
// Prevent exposing fileURL for non-fileURL type. // Prevent exposing fileURL for non-fileURL type.
// We need URL provided by dropped webloc file, but don't need file's URL. // We need URL provided by dropped webloc file, but don't need file's URL.
@ -234,7 +234,7 @@ nsDragService::IsValidType(NSString* availableType, bool allowFileURL)
return true; return true;
NS_OBJC_END_TRY_ABORT_BLOCK(false); NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
} }
NSString* NSString*

1
xpcom/glue/nsBaseHashtable.h
View file

@ -59,6 +59,7 @@ public:
typedef nsBaseHashtableET<KeyClass, DataType> EntryType; typedef nsBaseHashtableET<KeyClass, DataType> EntryType;
using nsTHashtable<EntryType>::Contains; using nsTHashtable<EntryType>::Contains;
using nsTHashtable<EntryType>::IsEmpty;
nsBaseHashtable() {} nsBaseHashtable() {}
explicit nsBaseHashtable(uint32_t aInitLength) explicit nsBaseHashtable(uint32_t aInitLength)