Bug 1525834 - Port bug 1095602: Remove STATE_SECURE flags from nsIWebProgressListener. r=mkmelin,frg ui-r=Paenglab a=jorgk
authoraceman <acelists@atlas.sk>
Sat, 09 Feb 2019 07:48:00 +0100
changeset 34342 0d11393715e4a7f6a79d54b742e21f0c7b3378a2
parent 34341 d18975332fe6db31ca7542f63d75782494de42d7
child 34343 fbdbfa0e0fe379c3458212a84e8b58b0245d5863
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersmkmelin, frg, Paenglab, jorgk
bugs1525834, 1095602
Bug 1525834 - Port bug 1095602: Remove STATE_SECURE flags from nsIWebProgressListener. r=mkmelin,frg ui-r=Paenglab a=jorgk
chat/content/browserRequest.js
chat/themes/browserRequest.css
mail/base/content/browserRequest.js
mail/base/content/specialTabs.js
mail/themes/linux/mail/browserRequest.css
mail/themes/osx/mail/browserRequest.css
mail/themes/shared/mail/tabmail.css
mail/themes/windows/mail/browserRequest.css
suite/mailnews/content/browserRequest.js
suite/themes/classic/mac/messenger/browserRequest.css
suite/themes/classic/messenger/browserRequest.css
suite/themes/modern/messenger/browserRequest.css
--- a/chat/content/browserRequest.js
+++ b/chat/content/browserRequest.js
@@ -69,31 +69,24 @@ var reporterListener = {
                            /*in wstring*/ aMessage) {
   },
 
   onSecurityChange: function(/*in nsIWebProgress*/ aWebProgress,
                              /*in nsIRequest*/ aRequest,
                              /*in unsigned long*/ aState) {
     const wpl_security_bits = wpl.STATE_IS_SECURE |
                               wpl.STATE_IS_BROKEN |
-                              wpl.STATE_IS_INSECURE |
-                              wpl.STATE_SECURE_HIGH |
-                              wpl.STATE_SECURE_MED |
-                              wpl.STATE_SECURE_LOW;
+                              wpl.STATE_IS_INSECURE;
     let browser = document.getElementById("requestFrame");
     let level;
 
     switch (aState & wpl_security_bits) {
-      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_HIGH:
+      case wpl.STATE_IS_SECURE:
         level = "high";
         break;
-      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_MED:
-      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_LOW:
-        level = "low";
-        break;
       case wpl.STATE_IS_BROKEN:
         level = "broken";
         break;
     }
     if (level) {
       this.securityButton.setAttribute("level", level);
       this.securityButton.hidden = false;
       this.securityLabel.setAttribute("label", browser.securityUI.tooltipText);
--- a/chat/themes/browserRequest.css
+++ b/chat/themes/browserRequest.css
@@ -6,18 +6,17 @@
   font-weight: bold;
   height: 2em;
 }
 #security-button {
   width: 20px;
   padding: 0;
   margin: 0;
 }
-#security-button[level="high"],
-#security-button[level="low"] {
+#security-button[level="high"] {
   background-image: url("chrome://messenger/skin/icons/secure.png");
 }
 
 #security-button[level="broken"] {
   background-image: url("chrome://messenger/skin/icons/insecure.png");
 }
 
 #header {
--- a/mail/base/content/browserRequest.js
+++ b/mail/base/content/browserRequest.js
@@ -40,31 +40,24 @@ var reporterListener = {
                  /* in wstring*/ aMessage) {
   },
 
   onSecurityChange(/* in nsIWebProgress*/ aWebProgress,
                    /* in nsIRequest*/ aRequest,
                    /* in unsigned long*/ aState) {
     const wpl_security_bits = wpl.STATE_IS_SECURE |
                               wpl.STATE_IS_BROKEN |
-                              wpl.STATE_IS_INSECURE |
-                              wpl.STATE_SECURE_HIGH |
-                              wpl.STATE_SECURE_MED |
-                              wpl.STATE_SECURE_LOW;
+                              wpl.STATE_IS_INSECURE;
     var browser = document.getElementById("requestFrame");
     var level;
 
     switch (aState & wpl_security_bits) {
-      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_HIGH:
+      case wpl.STATE_IS_SECURE:
         level = "high";
         break;
-      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_MED:
-      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_LOW:
-        level = "low";
-        break;
       case wpl.STATE_IS_BROKEN:
         level = "broken";
         break;
     }
     if (level) {
       this.securityButton.setAttribute("level", level);
       this.securityButton.hidden = false;
     } else {
--- a/mail/base/content/specialTabs.js
+++ b/mail/base/content/specialTabs.js
@@ -142,29 +142,22 @@ tabProgressListener.prototype = {
   },
   onSecurityChange(aWebProgress, aRequest, aState) {
     if (this.mProgressListener)
       this.mProgressListener.onSecurityChange(aWebProgress, aRequest, aState);
 
     const wpl = Ci.nsIWebProgressListener;
     const wpl_security_bits = wpl.STATE_IS_SECURE |
                               wpl.STATE_IS_BROKEN |
-                              wpl.STATE_IS_INSECURE |
-                              wpl.STATE_SECURE_HIGH |
-                              wpl.STATE_SECURE_MED |
-                              wpl.STATE_SECURE_LOW;
+                              wpl.STATE_IS_INSECURE;
     let level = "";
     switch (aState & wpl_security_bits) {
-      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_HIGH:
+      case wpl.STATE_IS_SECURE:
         level = "high";
         break;
-      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_MED:
-      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_LOW:
-        level = "low";
-        break;
       case wpl.STATE_IS_BROKEN:
         level = "broken";
         break;
     }
     if (level) {
       this.mTab.security.setAttribute("level", level);
       this.mTab.security.hidden = false;
     } else {
--- a/mail/themes/linux/mail/browserRequest.css
+++ b/mail/themes/linux/mail/browserRequest.css
@@ -4,18 +4,17 @@
 
 #security-button {
   width: 20px;
   margin-top: 1px;
   padding-right: 5px;
   background-repeat: no-repeat;
 }
 
-#security-button[level="high"],
-#security-button[level="low"] {
+#security-button[level="high"] {
   background-image: url("chrome://messenger/skin/icons/secure.png");
 }
 
 #security-button[level="broken"] {
   background-image: url("chrome://messenger/skin/icons/insecure.png");
 }
 
 #security-button[loading="true"] {
--- a/mail/themes/osx/mail/browserRequest.css
+++ b/mail/themes/osx/mail/browserRequest.css
@@ -4,18 +4,17 @@
 
 #security-button {
   width: 20px;
   margin-top: -1px;
   margin-right: 5px;
   background-repeat: no-repeat;
 }
 
-#security-button[level="high"],
-#security-button[level="low"] {
+#security-button[level="high"] {
   background-image: url("chrome://messenger/skin/icons/secure.png");
 }
 
 #security-button[level="broken"] {
   background-image: url("chrome://messenger/skin/icons/insecure.png");
 }
 
 #security-button[loading="true"] {
--- a/mail/themes/shared/mail/tabmail.css
+++ b/mail/themes/shared/mail/tabmail.css
@@ -363,22 +363,16 @@
 }
 
 .contentTabSecurity[level="high"] {
   background-image: url("chrome://messenger/skin/icons/connection-secure.svg");
   -moz-context-properties: fill;
   fill: #12bc00;
 }
 
-.contentTabSecurity[level="low"] {
-  background-image: url("chrome://messenger/skin/icons/connection-mixed.svg");
-  -moz-context-properties: fill;
-  fill: currentColor;
-}
-
 .contentTabSecurity[level="broken"] {
   background-image: url("chrome://messenger/skin/icons/connection-insecure.svg");
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
 .contentTabSecurity[loading="true"] {
   background-image: url("chrome://global/skin/icons/loading.png");
--- a/mail/themes/windows/mail/browserRequest.css
+++ b/mail/themes/windows/mail/browserRequest.css
@@ -3,18 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #security-button {
   width: 20px;
   padding-right: 5px;
   background-repeat: no-repeat;
 }
 
-#security-button[level="high"],
-#security-button[level="low"] {
+#security-button[level="high"] {
   background-image: url("chrome://messenger/skin/icons/secure.png");
 }
 
 #security-button[level="broken"] {
   background-image: url("chrome://messenger/skin/icons/insecure.png");
 }
 
 #security-button[loading="true"] {
--- a/suite/mailnews/content/browserRequest.js
+++ b/suite/mailnews/content/browserRequest.js
@@ -45,31 +45,24 @@ var reporterListener = {
                       /*in wstring*/ aMessage) {
   },
 
   onSecurityChange: function(/*in nsIWebProgress*/ aWebProgress,
                         /*in nsIRequest*/ aRequest,
                         /*in unsigned long*/ aState) {
     const wpl_security_bits = wpl.STATE_IS_SECURE |
                               wpl.STATE_IS_BROKEN |
-                              wpl.STATE_IS_INSECURE |
-                              wpl.STATE_SECURE_HIGH |
-                              wpl.STATE_SECURE_MED |
-                              wpl.STATE_SECURE_LOW;
+                              wpl.STATE_IS_INSECURE;
     var browser = document.getElementById("requestFrame");
     var level;
 
     switch (aState & wpl_security_bits) {
-      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_HIGH:
+      case wpl.STATE_IS_SECURE:
         level = "high";
         break;
-      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_MED:
-      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_LOW:
-        level = "low";
-        break;
       case wpl.STATE_IS_BROKEN:
         level = "broken";
         break;
     }
     if (level) {
       this.securityButton.setAttribute("level", level);
       this.securityButton.hidden = false;
     } else {
--- a/suite/themes/classic/mac/messenger/browserRequest.css
+++ b/suite/themes/classic/mac/messenger/browserRequest.css
@@ -4,18 +4,17 @@
 
 #security-button {
   width: 20px;
   margin-top: -1px;
   margin-right: 5px;
   background-repeat: no-repeat;
 }
 
-#security-button[level="high"],
-#security-button[level="low"] {
+#security-button[level="high"] {
   background-image: url("chrome://messenger/skin/icons/secure.png");
 }
 
 #security-button[level="broken"] {
   background-image: url("chrome://messenger/skin/icons/insecure.png");
 }
 
 #security-button[loading="true"] {
--- a/suite/themes/classic/messenger/browserRequest.css
+++ b/suite/themes/classic/messenger/browserRequest.css
@@ -3,18 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #security-button {
   width: 20px;
   padding-right: 5px;
   background-repeat: no-repeat;
 }
 
-#security-button[level="high"],
-#security-button[level="low"] {
+#security-button[level="high"] {
   background-image: url("chrome://messenger/skin/icons/secure.png");
 }
 
 #security-button[level="broken"] {
   background-image: url("chrome://messenger/skin/icons/insecure.png");
 }
 
 #security-button[loading="true"] {
--- a/suite/themes/modern/messenger/browserRequest.css
+++ b/suite/themes/modern/messenger/browserRequest.css
@@ -3,18 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #security-button {
   width: 20px;
   padding-right: 5px;
   background-repeat: no-repeat;
 }
 
-#security-button[level="high"],
-#security-button[level="low"] {
+#security-button[level="high"] {
   background-image: url("chrome://messenger/skin/icons/secure.png");
 }
 
 #security-button[level="broken"] {
   background-image: url("chrome://messenger/skin/icons/insecure.png");
 }
 
 #security-button[loading="true"] {