Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(648)

Unified Diff: third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js

Issue 2610963005: [DevTools] Pass the frame payload (Closed)
Patch Set: [DevTools] Pass the frame payload Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698