Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-04 07:40:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tanvi Vyas 2015-03-26 11:54:53 -07:00
parent 69c669cbeb
commit 0ca524deb8
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
security/manager/boot/src/nsSecureBrowserUIImpl.cpp
View File

@ -261,7 +261,19 @@ nsSecureBrowserUIImpl::MapInternalToExternalState(uint32_t* aState, lockIconStat
} }
// Has a Mixed Content Load initiated in nsMixedContentBlocker? // 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. // set by the lock parameter.
if (docShell->GetHasMixedActiveContentLoaded() && if (docShell->GetHasMixedActiveContentLoaded() &&
docShell->GetHasMixedDisplayContentLoaded()) { docShell->GetHasMixedDisplayContentLoaded()) {