Backed out changeset 868c99ece921 (bug 1484873) for ES lint failure /builds/worker/checkouts/gecko/browser/base/content/browser.js CLOSED TREE
authorMargareta Eliza Balazs <ebalazs@mozilla.com>
Wed, 17 Oct 2018 17:02:16 +0300
changeset 500131 3c175c006e65b1c139a1070d3d00e18e0d034d49
parent 500130 0442e4d321bb8952807bd0f5de7b1bdb2f4217a5
child 500132 29c0fc82e879891cd13464dc028c1d1c4da14ece
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1484873
milestone64.0a1
backs out868c99ece921edeec1b06259ee4060d35adeceea
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 868c99ece921 (bug 1484873) for ES lint failure /builds/worker/checkouts/gecko/browser/base/content/browser.js CLOSED TREE
browser/base/content/aboutNetError-new.xhtml
browser/base/content/browser.js
browser/base/content/test/about/browser_aboutCertError.js
browser/locales/en-US/chrome/overrides/netError.dtd
browser/themes/shared/aboutNetError-new.css
--- a/browser/base/content/aboutNetError-new.xhtml
+++ b/browser/base/content/aboutNetError-new.xhtml
@@ -193,17 +193,16 @@
 
       <div id="netErrorButtonContainer" class="button-container">
         <button id="errorTryAgain" class="primary" autocomplete="off">&retry.label;</button>
       </div>
 
       <div id="advancedPanelContainer">
         <div id="badCertAdvancedPanel" class="advanced-panel">
           <p id="badCertTechnicalInfo"/>
-          <a id="viewCertificate" href="javascript:void(0)">&viewCertificate.label;</a>
           <div id="advancedPanelButtonContainer" class="button-container">
             <button id="advancedPanelReturnButton" class="primary" autocomplete="off" data-telemetry-id="return_button_adv">&returnToPreviousPage1.label;</button>
             <button id="advancedPanelErrorTryAgain" class="primary" autocomplete="off">&retry.label;</button>
             <div class="exceptionDialogButtonContainer">
               <button id="exceptionDialogButton" data-telemetry-id="exception_button">&securityOverride.exceptionButton1Label;</button>
             </div>
           </div>
         </div>
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3036,22 +3036,16 @@ var BrowserOnClick = {
       break;
     }
   },
 
   onCertError(browser, elementId, isTopFrame, location, securityInfoAsString, frameId) {
     let securityInfo;
 
     switch (elementId) {
-      case "viewCertificate":
-        securityInfo = getSecurityInfo(securityInfoAsString);
-        let cert = securityInfo.serverCert;
-        Services.ww.openWindow(window, "chrome://pippki/content/certViewer.xul",
-                               "_blank", "centerscreen,chrome", cert);
-        break;
       case "exceptionDialogButton":
         securityInfo = getSecurityInfo(securityInfoAsString);
         let params = { exceptionAdded: false,
                        securityInfo };
         if (Services.prefs.getBoolPref("browser.security.newcerterrorpage.enabled", false)) {
           let overrideService = Cc["@mozilla.org/security/certoverride;1"]
                                   .getService(Ci.nsICertOverrideService);
           let flags = 0;
--- a/browser/base/content/test/about/browser_aboutCertError.js
+++ b/browser/base/content/test/about/browser_aboutCertError.js
@@ -477,42 +477,16 @@ add_task(async function checkCautionClas
       let doc = frame ? content.document.querySelector("iframe").contentDocument : content.document;
       ok(!doc.body.classList.contains("caution"), "Cert error body has no caution class");
     });
 
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
   }
 });
 
-add_task(async function checkViewCertificate() {
-  info("Loading a cert error and checking that the certificate can be shown.");
-  for (let useFrame of [false, true]) {
-    let tab = await openErrorPage(UNKNOWN_ISSUER, useFrame);
-    let browser = tab.linkedBrowser;
-
-    let dialogOpened = BrowserTestUtils.domWindowOpened();
-
-    await ContentTask.spawn(browser, {frame: useFrame}, async function({frame}) {
-      let doc = frame ? content.document.querySelector("iframe").contentDocument : content.document;
-      let viewCertificate = doc.getElementById("viewCertificate");
-      viewCertificate.click();
-    });
-
-    let win = await dialogOpened;
-    await BrowserTestUtils.waitForEvent(win, "load");
-    is(win.document.documentURI, "chrome://pippki/content/certViewer.xul",
-      "Opened the cert viewer dialog");
-    is(win.document.getElementById("commonname").value, "self-signed.example.com",
-      "Shows the correct certificate in the dialog");
-    win.close();
-
-    BrowserTestUtils.removeTab(gBrowser.selectedTab);
-  }
-});
-
 function getCertChain(securityInfoAsString) {
   let certChain = "";
   const serhelper = Cc["@mozilla.org/network/serialization-helper;1"]
                        .getService(Ci.nsISerializationHelper);
   let securityInfo = serhelper.deserializeObject(securityInfoAsString);
   securityInfo.QueryInterface(Ci.nsITransportSecurityInfo);
   for (let cert of securityInfo.failedCertChain.getEnumerator()) {
     certChain += getPEMString(cert);
--- a/browser/locales/en-US/chrome/overrides/netError.dtd
+++ b/browser/locales/en-US/chrome/overrides/netError.dtd
@@ -7,17 +7,16 @@
 
 <!ENTITY loadError.label "Problem loading page">
 <!ENTITY retry.label "Try Again">
 <!ENTITY returnToPreviousPage.label "Go Back">
 <!ENTITY returnToPreviousPage1.label "Go Back (Recommended)">
 <!ENTITY advanced.label "Advanced">
 <!ENTITY continue2.label "Moreā€¦">
 <!ENTITY moreInformation.label "More Information">
-<!ENTITY viewCertificate.label "View Certificate">
 
 <!-- Specific error messages -->
 
 <!ENTITY connectionFailure.title "Unable to connect">
 <!ENTITY connectionFailure.longDesc "&sharedLongDesc;">
 
 <!ENTITY deniedPortAccess.title "This address is restricted">
 <!ENTITY deniedPortAccess.longDesc "">
--- a/browser/themes/shared/aboutNetError-new.css
+++ b/browser/themes/shared/aboutNetError-new.css
@@ -59,17 +59,16 @@ button:disabled {
   display: none;
 }
 
 #advancedPanelButtonContainer {
   background-color: var(--exception-button-container-background);
   display: flex;
   justify-content: end;
   padding: 5px;
-  margin-top: 2em;
 }
 
 body:not(.neterror) #certErrorAndCaptivePortalButtonContainer {
   display: flex;
 }
 
 body:not(.neterror) #netErrorButtonContainer {
   display: none;
@@ -154,22 +153,18 @@ span#hostname {
   cursor: text;
   text-decoration: none;
 }
 
 #errorCode[href] {
   white-space: nowrap;
 }
 
-#viewCertificate {
-  margin: 0 3em;
-}
-
 #badCertTechnicalInfo {
-  margin: 3em 3em 1em;
+  margin: 3em;
   overflow: auto;
   white-space: pre-wrap;
 }
 
 #certificateErrorReporting {
   display: none;
 }