Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/security/SecurityPanel.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/security/SecurityPanel.js b/third_party/WebKit/Source/devtools/front_end/security/SecurityPanel.js |
| index 0937c3ef878adb27e61b22c3b300ae9387de8d87..1f23d0f4246b9294151d66826327ecedea21c340 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/security/SecurityPanel.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/security/SecurityPanel.js |
| @@ -347,11 +347,14 @@ Security.SecurityPanel = class extends UI.PanelWithSidebar { |
| // explanations to reflect the new counts. |
| this._mainView.refreshExplanations(); |
| - if (request) { |
| - var origin = Common.ParsedURL.extractOrigin(request.url()); |
| - this._sidebarTree.setMainOrigin(origin); |
| + // If we could not find a matching request (as in the case of clicking |
| + // through an interstitial, see crbug.com/669309), set the origin based upon |
| + // the url data from the MainFrameNavigated event itself. |
| + const origin = Common.ParsedURL.extractOrigin(request ? request.url() : frame.url); |
|
lushnikov
2017/03/21 18:26:36
nit: we don't use 'const' since it causes V8 deopt
elawrence
2017/03/22 01:04:41
Done.
|
| + this._sidebarTree.setMainOrigin(origin); |
| + |
| + if (request) |
| this._processRequest(request); |
| - } |
| } |
| _onInterstitialShown() { |