Bug 1192162 - Only set the ciphers attribute in the Control Center when no mixed content is detected. r=tanvi, r=MattN, a=ritu
authorBrian Grinstead <bgrinstead@mozilla.com>
Fri, 21 Aug 2015 09:29:00 -0700
changeset 288928 62156e0a139a3a912151c5904c5b3ee10ad0913c
parent 288927 d84ae094ebaf66830cbe1892e9daac1864cf9a7f
child 288929 9ca02c1d8027122bfd29927f4b51636b8ad875e8
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstanvi, MattN, ritu
bugs1192162
milestone42.0a2
Bug 1192162 - Only set the ciphers attribute in the Control Center when no mixed content is detected. r=tanvi, r=MattN, a=ritu
browser/base/content/browser.js
browser/themes/shared/controlcenter/panel.inc.css
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -7055,20 +7055,20 @@ var gIdentityHandler = {
     if (isMixedActiveContentLoaded) {
       mixedcontent.push("active-loaded");
     } else if (isMixedActiveContentBlocked) {
       mixedcontent.push("active-blocked");
     }
     mixedcontent = mixedcontent.join(" ");
 
     // We have no specific flags for weak ciphers (yet). If a connection is
-    // broken and we can't detect any mixed active content loaded then it's
-    // a weak cipher.
+    // broken and we can't detect any mixed content loaded then it's a weak
+    // cipher.
     let ciphers = "";
-    if (isBroken && !isMixedActiveContentLoaded) {
+    if (isBroken && !isMixedActiveContentLoaded && !isMixedPassiveContentLoaded) {
       ciphers = "weak";
     }
 
     // Update all elements.
     let elementIDs = [
       "identity-popup",
       "identity-popup-securityView-body",
     ];
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -11,17 +11,17 @@
 
 /* Show the right elements for the right connection states. */
 #identity-popup[connection=not-secure] [when-connection~=not-secure],
 #identity-popup[connection=secure-ev] [when-connection~=secure-ev],
 #identity-popup[connection=secure] [when-connection~=secure],
 #identity-popup[connection=chrome] [when-connection~=chrome],
 #identity-popup[connection=file] [when-connection~=file],
 /* Show weak cipher messages when needed. */
-#identity-popup[ciphers=weak]:not([mixedcontent]) [when-ciphers~=weak],
+#identity-popup[ciphers=weak] [when-ciphers~=weak],
 /* Show mixed content warnings when needed */
 #identity-popup[mixedcontent~=active-loaded] [when-mixedcontent=active-loaded],
 #identity-popup[mixedcontent~=passive-loaded]:not([mixedcontent~=active-loaded]) [when-mixedcontent=passive-loaded],
 #identity-popup[mixedcontent~=active-blocked]:not([mixedcontent~=passive-loaded]) [when-mixedcontent=active-blocked],
 /* Show the right elements when there is mixed passive content loaded and active blocked. */
 #identity-popup[mixedcontent~=active-blocked][mixedcontent~=passive-loaded] [when-mixedcontent~=active-blocked][when-mixedcontent~=passive-loaded],
 /* Show 'disable MCB' button always when there is mixed active content blocked. */
 #identity-popup-securityView-body[mixedcontent~=active-blocked] > button[when-mixedcontent=active-blocked] {