Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js b/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js |
| index eae9251e9005566caaf2e9310077938664f63d03..9f94d06db982b1e0a0d8dbba678d4822c674b9dd 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js |
| @@ -197,16 +197,17 @@ SDK.ResourceTreeModel = class extends SDK.SDKModel { |
| this._securityOriginManager.removeSecurityOrigin(frame.securityOrigin); |
| frame._navigate(framePayload); |
| - var addedOrigin = frame.securityOrigin; |
| + var addedOrigin = framePayload.securityOrigin; |
| this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.FrameNavigated, frame); |
| + if (addedOrigin) |
| + this._securityOriginManager.addSecurityOrigin(addedOrigin); |
| if (frame.isMainFrame()) { |
| + this._securityOriginManager.setMainSecurityOrigin(frame.securityOrigin); |
|
pfeldman
2017/01/06 19:49:08
You already have "addedOrigin" and you should do t
eostroukhov
2017/01/06 22:22:34
I joined the addSecurityOrigin and setMainSecurity
|
| this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.MainFrameNavigated, frame); |
| if (Common.moduleSetting('preserveConsoleLog').get()) |
| Common.console.log(Common.UIString('Navigated to %s', frame.url)); |
| } |
| - if (addedOrigin) |
| - this._securityOriginManager.addSecurityOrigin(addedOrigin); |
| // Fill frame with retained resources (the ones loaded using new loader). |
| var resources = frame.resources(); |