Macintosh-SW/tenfourfox
1
0
Fork 0
mirror of https://github.com/classilla/tenfourfox.git synced 2024-12-28 11:32:05 +00:00
Code Issues Projects Releases Wiki Activity

#622: M1660537 M1641487(modified) M1645492

Browse Source
This commit is contained in:
Cameron Kaiser 2020-09-09 21:50:04 -07:00
parent cceb528dd0
commit 291688840b
3 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/components/downloads/DownloadsViewUI.jsm
View File

@ -219,7 +219,8 @@ this.DownloadsViewUI.DownloadElementShell.prototype = {
} }
let referrer = this.download.source.referrer || this.download.source.url; let referrer = this.download.source.referrer || this.download.source.url;
let [displayHost, fullHost] = DownloadUtils.getURIHost(referrer); //let [displayHost, fullHost] = DownloadUtils.getURIHost(referrer);
let [displayHost, fullHost] = DownloadUtils.getURIHost(this.download.source.url);
let date = new Date(this.download.endTime); let date = new Date(this.download.endTime);
let [displayDate, fullDate] = DownloadUtils.getReadableDates(date); let [displayDate, fullDate] = DownloadUtils.getReadableDates(date);

4
dom/base/nsFrameLoader.cpp
View File

@ -2057,6 +2057,10 @@ nsFrameLoader::CheckForRecursiveLoad(nsIURI* aURI)
nsresult nsresult
nsFrameLoader::GetWindowDimensions(nsIntRect& aRect) nsFrameLoader::GetWindowDimensions(nsIntRect& aRect)
{ {
if (!mOwnerContent) {
return NS_ERROR_FAILURE;
}
// Need to get outer window position here // Need to get outer window position here
nsIDocument* doc = mOwnerContent->GetComposedDoc(); nsIDocument* doc = mOwnerContent->GetComposedDoc();
if (!doc) { if (!doc) {

37
security/manager/ssl/nsCertTree.cpp
View File

@ -465,17 +465,9 @@ nsCertTree::GetCertsByTypeFromCertList(CERTCertList *aCertList,
// overrides, we are storing certs without any trust flags associated. // overrides, we are storing certs without any trust flags associated.
// So we must check whether the cert really belongs to the // So we must check whether the cert really belongs to the
// server, email or unknown tab. We will lookup the cert in the override // server, email or unknown tab. We will lookup the cert in the override
// list to come to the decision. Unfortunately, the lookup in the // list to come to the decision.
// override list is quite expensive. Therefore we are using this if (aWantedType == nsIX509Cert::SERVER_CERT) {
// lengthy if/else statement to minimize wantThisCertIfHaveOverrides = true;
// the number of override-list-lookups.
if (aWantedType == nsIX509Cert::SERVER_CERT
&& thisCertType == nsIX509Cert::UNKNOWN_CERT) {
// This unknown cert was stored without trust
// Are there host:port based overrides stored?
// If yes, display them.
addOverrides = true;
} }
else else
if (aWantedType == nsIX509Cert::UNKNOWN_CERT if (aWantedType == nsIX509Cert::UNKNOWN_CERT
@ -486,27 +478,6 @@ nsCertTree::GetCertsByTypeFromCertList(CERTCertList *aCertList,
wantThisCertIfNoOverrides = true; wantThisCertIfNoOverrides = true;
} }
else else
if (aWantedType == nsIX509Cert::SERVER_CERT
&& thisCertType == nsIX509Cert::SERVER_CERT) {
// This server cert is explicitly marked as a web site peer,
// with or without trust, but editable, so show it
wantThisCert = true;
// Are there host:port based overrides stored?
// If yes, display them.
addOverrides = true;
}
else
if (aWantedType == nsIX509Cert::SERVER_CERT
&& thisCertType == nsIX509Cert::EMAIL_CERT) {
// This cert might have been categorized as an email cert
// because it carries an email address. But is it really one?
// Our cert categorization is uncertain when it comes to
// distinguish between email certs and web site certs.
// So, let's see if we have an override for that cert
// and if there is, conclude it's really a web site cert.
addOverrides = true;
}
else
if (aWantedType == nsIX509Cert::EMAIL_CERT if (aWantedType == nsIX509Cert::EMAIL_CERT
&& thisCertType == nsIX509Cert::EMAIL_CERT) { && thisCertType == nsIX509Cert::EMAIL_CERT) {
// This cert might have been categorized as an email cert // This cert might have been categorized as an email cert
@ -544,7 +515,7 @@ nsCertTree::GetCertsByTypeFromCertList(CERTCertList *aCertList,
if (wantThisCertIfHaveOverrides) { if (wantThisCertIfHaveOverrides) {
if (NS_SUCCEEDED(rv) && ocount > 0) { if (NS_SUCCEEDED(rv) && ocount > 0) {
// there are overrides for this cert // there are overrides for this cert
wantThisCert = true; addOverrides = true;
} }
} }
} }