Bug 947079 - Hack to prevent getting a mixed content icon on a fully secure page. r=keeler

This commit is contained in:
Tanvi Vyas 2015-03-26 11:54:53 -07:00
parent 69c669cbeb
commit 0ca524deb8

View File

@ -261,7 +261,19 @@ nsSecureBrowserUIImpl::MapInternalToExternalState(uint32_t* aState, lockIconStat
}
// Has a Mixed Content Load initiated in nsMixedContentBlocker?
// If so, the state should be broken; overriding the previous state
// * If not, the state should not be broken because of mixed content;
// overriding the previous state if it is inaccurately flagged as mixed.
if (lock == lis_mixed_security &&
!docShell->GetHasMixedActiveContentLoaded() &&
!docShell->GetHasMixedDisplayContentLoaded() &&
!docShell->GetHasMixedActiveContentBlocked() &&
!docShell->GetHasMixedDisplayContentBlocked()) {
*aState = STATE_IS_SECURE;
if (ev) {
*aState |= nsIWebProgressListener::STATE_IDENTITY_EV_TOPLEVEL;
}
}
// * If so, the state should be broken; overriding the previous state
// set by the lock parameter.
if (docShell->GetHasMixedActiveContentLoaded() &&
docShell->GetHasMixedDisplayContentLoaded()) {