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

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

Issue 2616023003: [Devtools] Reverse dependency of ResourceTreeModel and NetworkLog (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 18 matching lines...) Expand all
29 */ 29 */
30 30
31 /** 31 /**
32 * @unrestricted 32 * @unrestricted
33 */ 33 */
34 SDK.ResourceTreeModel = class extends SDK.SDKModel { 34 SDK.ResourceTreeModel = class extends SDK.SDKModel {
35 /** 35 /**
36 * @param {!SDK.Target} target 36 * @param {!SDK.Target} target
37 * @param {?SDK.NetworkManager} networkManager 37 * @param {?SDK.NetworkManager} networkManager
38 * @param {!SDK.SecurityOriginManager} securityOriginManager 38 * @param {!SDK.SecurityOriginManager} securityOriginManager
39 * @param {!SDK.NetworkLog} networkLog
39 */ 40 */
40 constructor(target, networkManager, securityOriginManager) { 41 constructor(target, networkManager, securityOriginManager, networkLog) {
41 super(SDK.ResourceTreeModel, target); 42 super(SDK.ResourceTreeModel, target);
43 this._networkLog = networkLog;
42 if (networkManager) { 44 if (networkManager) {
43 networkManager.addEventListener(SDK.NetworkManager.Events.RequestFinished, this._onRequestFinished, this); 45 networkManager.addEventListener(SDK.NetworkManager.Events.RequestFinished, this._onRequestFinished, this);
44 networkManager.addEventListener( 46 networkManager.addEventListener(
45 SDK.NetworkManager.Events.RequestUpdateDropped, this._onRequestUpdateD ropped, this); 47 SDK.NetworkManager.Events.RequestUpdateDropped, this._onRequestUpdateD ropped, this);
46 } 48 }
47 49
48 this._agent = target.pageAgent(); 50 this._agent = target.pageAgent();
49 this._agent.enable(); 51 this._agent.enable();
50 this._securityOriginManager = securityOriginManager; 52 this._securityOriginManager = securityOriginManager;
51 53
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 static resourceForURL(url) { 85 static resourceForURL(url) {
84 for (var target of SDK.targetManager.targets(SDK.Target.Capability.DOM)) { 86 for (var target of SDK.targetManager.targets(SDK.Target.Capability.DOM)) {
85 var mainFrame = SDK.ResourceTreeModel.fromTarget(target).mainFrame; 87 var mainFrame = SDK.ResourceTreeModel.fromTarget(target).mainFrame;
86 var result = mainFrame ? mainFrame.resourceForURL(url) : null; 88 var result = mainFrame ? mainFrame.resourceForURL(url) : null;
87 if (result) 89 if (result)
88 return result; 90 return result;
89 } 91 }
90 return null; 92 return null;
91 } 93 }
92 94
95 /**
96 * @return {!SDK.NetworkLog}
97 */
98 networkLog() {
99 return this._networkLog;
100 }
101
93 _fetchResourceTree() { 102 _fetchResourceTree() {
94 /** @type {!Map<string, !SDK.ResourceTreeFrame>} */ 103 /** @type {!Map<string, !SDK.ResourceTreeFrame>} */
95 this._frames = new Map(); 104 this._frames = new Map();
96 this._cachedResourcesProcessed = false; 105 this._cachedResourcesProcessed = false;
97 this._agent.getResourceTree(this._processCachedResources.bind(this)); 106 this._agent.getResourceTree(this._processCachedResources.bind(this));
98 } 107 }
99 108
100 _processCachedResources(error, mainFramePayload) { 109 _processCachedResources(error, mainFramePayload) {
101 if (!error) { 110 if (!error) {
102 this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.WillLoadCachedR esources); 111 this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.WillLoadCachedR esources);
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 } 203 }
195 204
196 this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.FrameWillNavigate , frame); 205 this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.FrameWillNavigate , frame);
197 206
198 this._securityOriginManager.removeSecurityOrigin(frame.securityOrigin); 207 this._securityOriginManager.removeSecurityOrigin(frame.securityOrigin);
199 frame._navigate(framePayload); 208 frame._navigate(framePayload);
200 var addedOrigin = frame.securityOrigin; 209 var addedOrigin = frame.securityOrigin;
201 210
202 this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.FrameNavigated, f rame); 211 this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.FrameNavigated, f rame);
203 if (frame.isMainFrame()) { 212 if (frame.isMainFrame()) {
213 this._networkLog.mainFrameNavigated(frame);
204 this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.MainFrameNaviga ted, frame); 214 this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.MainFrameNaviga ted, frame);
205 if (Common.moduleSetting('preserveConsoleLog').get()) 215 if (Common.moduleSetting('preserveConsoleLog').get())
206 Common.console.log(Common.UIString('Navigated to %s', frame.url)); 216 Common.console.log(Common.UIString('Navigated to %s', frame.url));
207 } 217 }
208 if (addedOrigin) 218 if (addedOrigin)
209 this._securityOriginManager.addSecurityOrigin(addedOrigin); 219 this._securityOriginManager.addSecurityOrigin(addedOrigin);
210 220
211 // Fill frame with retained resources (the ones loaded using new loader). 221 // Fill frame with retained resources (the ones loaded using new loader).
212 var resources = frame.resources(); 222 var resources = frame.resources();
213 for (var i = 0; i < resources.length; ++i) 223 for (var i = 0; i < resources.length; ++i)
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 SDK.PageDispatcher = class { 763 SDK.PageDispatcher = class {
754 constructor(resourceTreeModel) { 764 constructor(resourceTreeModel) {
755 this._resourceTreeModel = resourceTreeModel; 765 this._resourceTreeModel = resourceTreeModel;
756 } 766 }
757 767
758 /** 768 /**
759 * @override 769 * @override
760 * @param {number} time 770 * @param {number} time
761 */ 771 */
762 domContentEventFired(time) { 772 domContentEventFired(time) {
773 this._resourceTreeModel.networkLog().domContentLoaded(time);
763 this._resourceTreeModel.dispatchEventToListeners(SDK.ResourceTreeModel.Event s.DOMContentLoaded, time); 774 this._resourceTreeModel.dispatchEventToListeners(SDK.ResourceTreeModel.Event s.DOMContentLoaded, time);
764 } 775 }
765 776
766 /** 777 /**
767 * @override 778 * @override
768 * @param {number} time 779 * @param {number} time
769 */ 780 */
770 loadEventFired(time) { 781 loadEventFired(time) {
782 this._resourceTreeModel.networkLog().pageLoaded(time);
771 this._resourceTreeModel.dispatchEventToListeners(SDK.ResourceTreeModel.Event s.Load, time); 783 this._resourceTreeModel.dispatchEventToListeners(SDK.ResourceTreeModel.Event s.Load, time);
772 } 784 }
773 785
774 /** 786 /**
775 * @override 787 * @override
776 * @param {!Protocol.Page.FrameId} frameId 788 * @param {!Protocol.Page.FrameId} frameId
777 * @param {!Protocol.Page.FrameId} parentFrameId 789 * @param {!Protocol.Page.FrameId} parentFrameId
778 */ 790 */
779 frameAttached(frameId, parentFrameId) { 791 frameAttached(frameId, parentFrameId) {
780 this._resourceTreeModel._frameAttached(frameId, parentFrameId); 792 this._resourceTreeModel._frameAttached(frameId, parentFrameId);
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
893 this._resourceTreeModel.dispatchEventToListeners(SDK.ResourceTreeModel.Event s.InterstitialHidden); 905 this._resourceTreeModel.dispatchEventToListeners(SDK.ResourceTreeModel.Event s.InterstitialHidden);
894 } 906 }
895 907
896 /** 908 /**
897 * @override 909 * @override
898 */ 910 */
899 navigationRequested() { 911 navigationRequested() {
900 // Frontend is not interested in when navigations are requested. 912 // Frontend is not interested in when navigations are requested.
901 } 913 }
902 }; 914 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698