Link to the mixed content filter from security panel

BUG=504537

Review URL: https://codereview.chromium.org/1327593005

git-svn-id: svn://svn.chromium.org/blink/trunk@202002 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js

@@ -1034,6 +1034,15 @@ WebInspector.NetworkLogView.prototype = {
         }
     },
 
+    /**
+      * @param {!WebInspector.NetworkLogView.FilterType} filterType
+      * @param {string} filterValue
+      */
+    setTextFilterValue: function(filterType, filterValue)
+    {
+        this._textFilterUI.setValue(filterType + ":" + filterValue);
+    },
+
     /**
      * @param {!WebInspector.Event} event
      */

third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js

@@ -638,6 +638,17 @@ WebInspector.NetworkPanel.show = function()
     WebInspector.inspectorView.setCurrentPanel(WebInspector.NetworkPanel._instance());
 }
 
+/**
+  * @param {!WebInspector.NetworkLogView.FilterType} filterType
+  * @param {string} filterValue
+  */
+WebInspector.NetworkPanel.revealAndFilter = function(filterType, filterValue)
+{
+    var panel = WebInspector.NetworkPanel._instance();
+    panel._networkLogView.setTextFilterValue(filterType, filterValue);
+    WebInspector.inspectorView.setCurrentPanel(panel);
+}
+
 /**
  * @return {!WebInspector.NetworkPanel}
  */

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

@@ -46,6 +46,20 @@ WebInspector.SecurityModel.fromTarget = function(target)
     return model;
 }
 
+/**
+ * @constructor
+ * @param {!SecurityAgent.SecurityState} securityState
+ * @param {!Array<!SecurityAgent.SecurityStateExplanation>} explanations
+ * @param {?SecurityAgent.MixedContentStatus} mixedContentStatus
+ * @param {boolean} schemeIsCryptographic
+ */
+WebInspector.PageSecurityState = function (securityState, explanations, mixedContentStatus, schemeIsCryptographic) {
+    this.securityState = securityState;
+    this.explanations = explanations;
+    this.mixedContentStatus = mixedContentStatus;
+    this.schemeIsCryptographic = schemeIsCryptographic;
+}
+
 /**
  * @constructor
  * @implements {SecurityAgent.Dispatcher}
@@ -65,22 +79,7 @@ WebInspector.SecurityDispatcher.prototype = {
      */
     securityStateChanged: function(securityState, explanations, mixedContentStatus, schemeIsCryptographic)
     {
-        var data = {"securityState": securityState, "explanations": explanations || []};
-        if (schemeIsCryptographic && mixedContentStatus) {
-            if (mixedContentStatus.ranInsecureContent) {
-                explanations.push({
-                    "securityState": mixedContentStatus.ranInsecureContentStyle,
-                    "summary": WebInspector.UIString("Active Mixed Content"),
-                    "description": WebInspector.UIString("You have recently allowed insecure content (such as scripts or iframes) to run on this site.")
-                });
-            } else if (mixedContentStatus.displayedInsecureContent) {
-                explanations.push({
-                    "securityState": mixedContentStatus.displayedInsecureContentStyle,
-                    "summary": WebInspector.UIString("Mixed Content"),
-                    "description": WebInspector.UIString("The site includes HTTP resources.")
-                });
-            }
-        }
-        this._model.dispatchEventToListeners(WebInspector.SecurityModel.EventTypes.SecurityStateChanged, data);
+        var pageSecurityState = new WebInspector.PageSecurityState(securityState, explanations || [], mixedContentStatus || null, schemeIsCryptographic || false);
+        this._model.dispatchEventToListeners(WebInspector.SecurityModel.EventTypes.SecurityStateChanged, pageSecurityState);
     }
-}
\ No newline at end of file
+}

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

@@ -57,11 +57,13 @@ WebInspector.SecurityPanel.prototype = {
     /**
      * @param {!SecurityAgent.SecurityState} newSecurityState
      * @param {!Array<!SecurityAgent.SecurityStateExplanation>} explanations
+     * @param {?SecurityAgent.MixedContentStatus} mixedContentStatus
+     * @param {boolean} schemeIsCryptographic
      */
-    _updateSecurityState: function(newSecurityState, explanations)
+    _updateSecurityState: function(newSecurityState, explanations, mixedContentStatus, schemeIsCryptographic)
     {
         this._sidebarMainViewElement.setSecurityState(newSecurityState);
-        this._mainView.updateSecurityState(newSecurityState, explanations);
+        this._mainView.updateSecurityState(newSecurityState, explanations, mixedContentStatus, schemeIsCryptographic);
     },
 
     /**
@@ -69,9 +71,12 @@ WebInspector.SecurityPanel.prototype = {
      */
     _onSecurityStateChanged: function(event)
     {
-        var securityState = /** @type {!SecurityAgent.SecurityState} */ (event.data.securityState);
-        var explanations = /** @type {!Array<!SecurityAgent.SecurityStateExplanation>} */ (event.data.explanations);
-        this._updateSecurityState(securityState, explanations);
+        var data = /** @type {!WebInspector.PageSecurityState} */ (event.data);
+        var securityState = /** @type {!SecurityAgent.SecurityState} */ (data.securityState);
+        var explanations = /** @type {!Array<!SecurityAgent.SecurityStateExplanation>} */ (data.explanations);
+        var mixedContentStatus = /** @type {?SecurityAgent.MixedContentStatus} */ (data.mixedContentStatus);
+        var schemeIsCryptographic = /** @type {boolean} */ (data.schemeIsCryptographic);
+        this._updateSecurityState(securityState, explanations, mixedContentStatus, schemeIsCryptographic);
     },
 
     showMainView: function()
@@ -180,7 +185,7 @@ WebInspector.SecurityPanel.prototype = {
 
     _clear: function()
     {
-        this._updateSecurityState(SecurityAgent.SecurityState.Unknown, []);
+        this._updateSecurityState(SecurityAgent.SecurityState.Unknown, [], null, false);
         this._sidebarMainViewElement.select();
         this._sidebarOriginSection.removeChildren();
         this._origins.clear();
@@ -332,6 +337,7 @@ WebInspector.SecurityMainView = function()
 WebInspector.SecurityMainView.prototype = {
     /**
      * @param {!SecurityAgent.SecurityStateExplanation} explanation
+     * @return {!Element}
      */
     _addExplanation: function(explanation)
     {
@@ -348,6 +354,9 @@ WebInspector.SecurityMainView.prototype = {
             certificateAnchor.href = "";
             certificateAnchor.addEventListener("click", showCertificateViewer, false);
         }
+
+        return text;
+
         /**
          * @param {!Event} e
          */
@@ -361,8 +370,10 @@ WebInspector.SecurityMainView.prototype = {
     /**
      * @param {!SecurityAgent.SecurityState} newSecurityState
      * @param {!Array<!SecurityAgent.SecurityStateExplanation>} explanations
+     * @param {?SecurityAgent.MixedContentStatus} mixedContentStatus
+     * @param {boolean} schemeIsCryptographic
      */
-    updateSecurityState: function(newSecurityState, explanations)
+    updateSecurityState: function(newSecurityState, explanations, mixedContentStatus, schemeIsCryptographic)
     {
         // Remove old state.
         // It's safe to call this even when this._securityState is undefined.
@@ -384,6 +395,47 @@ WebInspector.SecurityMainView.prototype = {
         this._securityExplanations.removeChildren();
         for (var explanation of explanations)
             this._addExplanation(explanation);
+
+        if (schemeIsCryptographic && mixedContentStatus && (mixedContentStatus.ranInsecureContent || mixedContentStatus.displayedInsecureContent)) {
+            /** @type {!SecurityAgent.SecurityStateExplanation} */
+            var mixedContentExplanation;
+            if (mixedContentStatus.ranInsecureContent) {
+                mixedContentExplanation = /** @type {!SecurityAgent.SecurityStateExplanation} */ ({
+                    "securityState": mixedContentStatus.ranInsecureContentStyle,
+                    "summary": WebInspector.UIString("Active Mixed Content"),
+                    "description": WebInspector.UIString("You have recently allowed insecure content (such as scripts or iframes) to run on this site.")
+                });
+            } else if (mixedContentStatus.displayedInsecureContent) {
+                mixedContentExplanation = /** @type {!SecurityAgent.SecurityStateExplanation} */ ({
+                    "securityState": mixedContentStatus.displayedInsecureContentStyle,
+                    "summary": WebInspector.UIString("Mixed Content"),
+                    "description": WebInspector.UIString("The site includes HTTP resources.")
+                });
+            }
+
+            var requestsAnchor = this._addExplanation(mixedContentExplanation).createChild("div", "security-mixed-content link");
+            requestsAnchor.textContent = WebInspector.UIString("View requests in Network Panel");
+            requestsAnchor.href = "";
+            requestsAnchor.addEventListener("click", mixedContentStatus.ranInsecureContent ? showBlockOverriddenMixedContentInNetworkPanel : showDisplayedMixedContentInNetworkPanel, false);
+        }
+
+        /**
+         * @param {!Event} e
+         */
+        function showDisplayedMixedContentInNetworkPanel(e)
+        {
+            e.consume();
+            WebInspector.NetworkPanel.revealAndFilter(WebInspector.NetworkLogView.FilterType.MixedContent, "displayed");
+        }
+
+        /**
+         * @param {!Event} e
+         */
+        function showBlockOverriddenMixedContentInNetworkPanel(e)
+        {
+            e.consume();
+            WebInspector.NetworkPanel.revealAndFilter(WebInspector.NetworkLogView.FilterType.MixedContent, "block-overridden");
+        }
     },
 
     __proto__: WebInspector.VBox.prototype

third_party/WebKit/Source/devtools/front_end/security/mainView.css

@@ -59,4 +59,8 @@
 .security-main-view .security-section-title {
     color: rgb(90, 90, 90);
     margin-bottom: 8px;
+}
+
+.security-main-view .security-mixed-content {
+    margin-top: 8px;
 }
\ No newline at end of file

third_party/WebKit/Source/devtools/front_end/security/module.json

@@ -8,7 +8,7 @@
             "className": "WebInspector.SecurityPanelFactory"
         }
     ],
-    "dependencies": ["platform", "ui", "sdk"],
+    "dependencies": ["network", "platform", "ui", "sdk"],
     "experiment": "securityPanel",
     "scripts": [
         "SecurityModel.js",