Do not prompt for reload when security panel is opened on an interstitial

third_party/WebKit/Source/devtools/front_end/security/SecurityPanel.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 /**
  * @implements {SDK.TargetManager.Observer}
  * @unrestricted
  */
 Security.SecurityPanel = class extends UI.PanelWithSidebar {
   constructor() {
     super('security');
@@ skipping 77 matching lines @@
    */
   setDisplayedInsecureContentStyle(securityState) {
     this._displayedInsecureContentStyle = securityState;
   }
 
   /**
    * @param {!Protocol.Security.SecurityState} newSecurityState
    * @param {!Array<!Protocol.Security.SecurityStateExplanation>} explanations
    * @param {?Protocol.Security.InsecureContentStatus} insecureContentStatus
    * @param {boolean} schemeIsCryptographic
+   * @param {boolean} interstitialIsShowing
    */
-  _updateSecurityState(newSecurityState, explanations, insecureContentStatus, schemeIsCryptographic) {
+  _updateSecurityState(newSecurityState, explanations, insecureContentStatus, schemeIsCryptographic, interstitialIsShowing) {
     this._sidebarMainViewElement.setSecurityState(newSecurityState);
-    this._mainView.updateSecurityState(newSecurityState, explanations, insecureContentStatus, schemeIsCryptographic);
+    this._mainView.updateSecurityState(newSecurityState, explanations, insecureContentStatus, schemeIsCryptographic, interstitialIsShowing);
   }
 
   /**
    * @param {!Common.Event} event
    */
   _onSecurityStateChanged(event) {
     var data = /** @type {!Security.PageSecurityState} */ (event.data);
     var securityState = /** @type {!Protocol.Security.SecurityState} */ (data.securityState);
     var explanations = /** @type {!Array<!Protocol.Security.SecurityStateExplanation>} */ (data.explanations);
     var insecureContentStatus = /** @type {?Protocol.Security.InsecureContentStatus} */ (data.insecureContentStatus);
     var schemeIsCryptographic = /** @type {boolean} */ (data.schemeIsCryptographic);
-    this._updateSecurityState(securityState, explanations, insecureContentStatus, schemeIsCryptographic);
+    var interstitialIsShowing = /** @type {boolean} */ (data.interstitialIsShowing);
+    this._updateSecurityState(securityState, explanations, insecureContentStatus, schemeIsCryptographic, interstitialIsShowing);
   }
 
   selectAndSwitchToMainView() {
     // The sidebar element will trigger displaying the main view. Rather than making a redundant call to display the main view, we rely on this.
     this._sidebarMainViewElement.select();
   }
+
+  /**
+   * @param {boolean} hidden
+   */
+  toggleOriginsList(hidden) {
+    this._sidebarTree.toggleOriginsList(hidden);
+  }
+
   /**
    * @param {!Security.SecurityPanel.Origin} origin
    */
   showOrigin(origin) {
     var originState = this._origins.get(origin);
     if (!originState.originView)
       originState.originView = new Security.SecurityOriginView(this, origin, originState);
 
     this._setVisibleView(originState.originView);
   }
@@ skipping 150 matching lines @@
     if (this._target)
       return;
 
     var listeners = [];
     var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(target);
     if (resourceTreeModel) {
       listeners = listeners.concat([
         resourceTreeModel.addEventListener(
             SDK.ResourceTreeModel.Events.MainFrameNavigated, this._onMainFrameNavigated, this),
         resourceTreeModel.addEventListener(
-            SDK.ResourceTreeModel.Events.InterstitialShown, this._onInterstitialShown, this),
+            SDK.ResourceTreeModel.Events.InterstitialShown, this.onInterstitialShown, this),
         resourceTreeModel.addEventListener(
-            SDK.ResourceTreeModel.Events.InterstitialHidden, this._onInterstitialHidden, this),
+            SDK.ResourceTreeModel.Events.InterstitialHidden, this.onInterstitialHidden, this),
       ]);
     }
 
     var networkManager = SDK.NetworkManager.fromTarget(target);
     if (networkManager) {
       listeners = listeners.concat([
         networkManager.addEventListener(SDK.NetworkManager.Events.ResponseReceived, this._onResponseReceived, this),
         networkManager.addEventListener(SDK.NetworkManager.Events.RequestFinished, this._onRequestFinished, this),
       ]);
     }
@@ skipping 38 matching lines @@
     // explanations to reflect the new counts.
     this._mainView.refreshExplanations();
 
     if (request) {
       var origin = Common.ParsedURL.extractOrigin(request.url);
       this._sidebarTree.setMainOrigin(origin);
       this._processRequest(request);
     }
   }
 
-  _onInterstitialShown() {
+  onInterstitialShown() {
     // The panel might have been displaying the origin view on the
     // previously loaded page. When showing an interstitial, switch
     // back to the Overview view.
     this.selectAndSwitchToMainView();
     this._sidebarTree.toggleOriginsList(true /* hidden */);
   }
 
-  _onInterstitialHidden() {
+  onInterstitialHidden() {
     this._sidebarTree.toggleOriginsList(false /* hidden */);
   }
 };
 
 /** @typedef {string} */
 Security.SecurityPanel.Origin;
 
 /**
  * @typedef {Object}
  * @property {!Protocol.Security.SecurityState} securityState - Current security state of the origin.
@@ skipping 13 matching lines @@
    * @param {function(!Security.SecurityPanel.Origin)} showOriginInPanel
    */
   constructor(mainViewElement, showOriginInPanel) {
     super();
     this.registerRequiredCSS('security/sidebar.css');
     this.registerRequiredCSS('security/lockIcon.css');
     this.appendChild(mainViewElement);
 
     this._showOriginInPanel = showOriginInPanel;
     this._mainOrigin = null;
+    this._originsAreHidden = false;
 
     /** @type {!Map<!Security.SecurityPanelSidebarTree.OriginGroupName, !TreeElement>} */
     this._originGroups = new Map();
 
     for (var key in Security.SecurityPanelSidebarTree.OriginGroupName) {
       var originGroupName = Security.SecurityPanelSidebarTree.OriginGroupName[key];
       var originGroup = new TreeElement(originGroupName, true);
       originGroup.selectable = false;
       originGroup.expand();
       originGroup.listItemElement.classList.add('security-sidebar-origins');
@@ skipping 10 matching lines @@
         .appendChild(mainViewReloadMessage);
 
     /** @type {!Map<!Security.SecurityPanel.Origin, !Security.SecurityPanelSidebarTreeElement>} */
     this._elementsByOrigin = new Map();
   }
 
   /**
    * @param {boolean} hidden
    */
   toggleOriginsList(hidden) {
+    this._originsAreHidden = hidden;
     for (var key in Security.SecurityPanelSidebarTree.OriginGroupName) {
       var originGroupName = Security.SecurityPanelSidebarTree.OriginGroupName[key];
       var group = this._originGroups.get(originGroupName);
       if (group)
         group.hidden = hidden;
     }
   }
 
   /**
    * @param {!Security.SecurityPanel.Origin} origin
@@ skipping 41 matching lines @@
     }
 
     var oldParent = originElement.parent;
     if (oldParent !== newParent) {
       if (oldParent) {
         oldParent.removeChild(originElement);
         if (oldParent.childCount() === 0)
           oldParent.hidden = true;
       }
       newParent.appendChild(originElement);
-      newParent.hidden = false;
+      newParent.hidden = this._originsAreHidden;

[estark, 2016/11/21 22:42:06]

This is the drive-by bug fix I mentioned in the CL description: once an
interstitial is shown and the sidebar origins list is hidden, requests that
finish after that should also be hidden.

     }
   }
 
   _clearOriginGroups() {
     for (var originGroup of this._originGroups.values()) {
       originGroup.removeChildren();
       originGroup.hidden = true;
     }
     this._originGroups.get(Security.SecurityPanelSidebarTree.OriginGroupName.MainOrigin).hidden = false;
   }
@@ skipping 136 matching lines @@
     }
 
     return text;
   }
 
   /**
    * @param {!Protocol.Security.SecurityState} newSecurityState
    * @param {!Array<!Protocol.Security.SecurityStateExplanation>} explanations
    * @param {?Protocol.Security.InsecureContentStatus} insecureContentStatus
    * @param {boolean} schemeIsCryptographic
+   * @param {boolean} interstitialIsShowing
    */
-  updateSecurityState(newSecurityState, explanations, insecureContentStatus, schemeIsCryptographic) {
+  updateSecurityState(newSecurityState, explanations, insecureContentStatus, schemeIsCryptographic, interstitialIsShowing) {
     // Remove old state.
     // It's safe to call this even when this._securityState is undefined.
     this._summarySection.classList.remove('security-summary-' + this._securityState);
 
     // Add new state.
     this._securityState = newSecurityState;
     this._summarySection.classList.add('security-summary-' + this._securityState);
     var summaryExplanationStrings = {
       'unknown': Common.UIString('The security of this page is unknown.'),
       'insecure': Common.UIString('This page is not secure (broken HTTPS).'),
       'neutral': Common.UIString('This page is not secure.'),
       'secure': Common.UIString('This page is secure (valid HTTPS).')
     };
     this._summaryText.textContent = summaryExplanationStrings[this._securityState];
 
     this._explanations = explanations, this._insecureContentStatus = insecureContentStatus;
     this._schemeIsCryptographic = schemeIsCryptographic;
 
     this._panel.setRanInsecureContentStyle(insecureContentStatus.ranInsecureContentStyle);
     this._panel.setDisplayedInsecureContentStyle(insecureContentStatus.displayedInsecureContentStyle);
 
     this.refreshExplanations();
+
+    // If an interstitial is showing, show the Overview view and hide the origins list.
+    if (interstitialIsShowing)
+      this._panel.onInterstitialShown();
+    else
+      this._panel.onInterstitialHidden();
   }
 
   refreshExplanations() {
     this._securityExplanationsMain.removeChildren();
     this._securityExplanationsExtra.removeChildren();
     for (var explanation of this._explanations) {
       if (explanation.securityState === Protocol.Security.SecurityState.Info)
         this._addExplanation(this._securityExplanationsExtra, explanation);
       else
         this._addExplanation(this._securityExplanationsMain, explanation);
@@ skipping 358 matching lines @@
     var row = this._element.createChild('div', 'details-table-row');
     row.createChild('div').textContent = key;
 
     var valueDiv = row.createChild('div');
     if (typeof value === 'string')
       valueDiv.textContent = value;
     else
       valueDiv.appendChild(value);
   }
 };