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

Unified 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 side-by-side diff with in-line comments
Download patch
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..0564b65e1cad03e1ec242d1ccdff51f57a4901bd 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
@@ -36,9 +36,11 @@ SDK.ResourceTreeModel = class extends SDK.SDKModel {
* @param {!SDK.Target} target
* @param {?SDK.NetworkManager} networkManager
* @param {!SDK.SecurityOriginManager} securityOriginManager
+ * @param {!SDK.NetworkLog} networkLog
*/
- constructor(target, networkManager, securityOriginManager) {
+ constructor(target, networkManager, securityOriginManager, networkLog) {
super(SDK.ResourceTreeModel, target);
+ this._networkLog = networkLog;
if (networkManager) {
networkManager.addEventListener(SDK.NetworkManager.Events.RequestFinished, this._onRequestFinished, this);
networkManager.addEventListener(
@@ -90,6 +92,13 @@ SDK.ResourceTreeModel = class extends SDK.SDKModel {
return null;
}
+ /**
+ * @return {!SDK.NetworkLog}
+ */
+ networkLog() {
+ return this._networkLog;
+ }
+
_fetchResourceTree() {
/** @type {!Map<string, !SDK.ResourceTreeFrame>} */
this._frames = new Map();
@@ -201,6 +210,7 @@ SDK.ResourceTreeModel = class extends SDK.SDKModel {
this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.FrameNavigated, frame);
if (frame.isMainFrame()) {
+ this._networkLog.mainFrameNavigated(frame);
this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.MainFrameNavigated, frame);
if (Common.moduleSetting('preserveConsoleLog').get())
Common.console.log(Common.UIString('Navigated to %s', frame.url));
@@ -760,6 +770,7 @@ SDK.PageDispatcher = class {
* @param {number} time
*/
domContentEventFired(time) {
+ this._resourceTreeModel.networkLog().domContentLoaded(time);
this._resourceTreeModel.dispatchEventToListeners(SDK.ResourceTreeModel.Events.DOMContentLoaded, time);
}
@@ -768,6 +779,7 @@ SDK.PageDispatcher = class {
* @param {number} time
*/
loadEventFired(time) {
+ this._resourceTreeModel.networkLog().pageLoaded(time);
this._resourceTreeModel.dispatchEventToListeners(SDK.ResourceTreeModel.Events.Load, time);
}

Powered by Google App Engine
This is Rietveld 408576698