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

Unified Diff: third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js

Issue 2801943003: [DevTools] Remove SDK.SDKObject (Closed)
Patch Set: Created 3 years, 8 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/network/NetworkLogView.js
diff --git a/third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js b/third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js
index d55d185236884e3e294fabc75426c3979702f66d..752ab84261f864dca0c3c1d2eb03c8387b8bd49d 100644
--- a/third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js
+++ b/third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js
@@ -29,7 +29,7 @@
*/
/**
* @implements {UI.Searchable}
- * @implements {SDK.TargetManager.Observer}
+ * @implements {SDK.SDKModelObserver<!SDK.NetworkManager>}
* @unrestricted
*/
Network.NetworkLogView = class extends UI.VBox {
@@ -110,7 +110,7 @@ Network.NetworkLogView = class extends UI.VBox {
Common.moduleSetting('networkColorCodeResourceTypes')
.addChangeListener(this._invalidateAllItems.bind(this, false), this);
- SDK.targetManager.observeTargets(this);
+ SDK.targetManager.observeModels(SDK.NetworkManager, this);
SDK.targetManager.addModelListener(
SDK.NetworkManager, SDK.NetworkManager.Events.RequestStarted, this._onRequestStarted, this);
SDK.targetManager.addModelListener(
@@ -389,11 +389,11 @@ Network.NetworkLogView = class extends UI.VBox {
/**
* @override
- * @param {!SDK.Target} target
+ * @param {!SDK.NetworkManager} networkManager
*/
- targetAdded(target) {
- if (!target.parentTarget()) {
- var resourceTreeModel = target.model(SDK.ResourceTreeModel);
+ modelAdded(networkManager) {
+ if (!networkManager.target().parentTarget()) {
+ var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeModel);
if (resourceTreeModel) {
resourceTreeModel.addEventListener(
SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavigated, this);
@@ -402,16 +402,16 @@ Network.NetworkLogView = class extends UI.VBox {
SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoadedEventFired, this);
}
}
- NetworkLog.networkLog.requestsForTarget(target).forEach(this._appendRequest.bind(this));
+ NetworkLog.networkLog.requestsForManager(networkManager).forEach(this._appendRequest.bind(this));
}
/**
* @override
- * @param {!SDK.Target} target
+ * @param {!SDK.NetworkManager} networkManager
*/
- targetRemoved(target) {
- if (!target.parentTarget()) {
- var resourceTreeModel = target.model(SDK.ResourceTreeModel);
+ modelRemoved(networkManager) {
+ if (!networkManager.target().parentTarget()) {
+ var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeModel);
if (resourceTreeModel) {
resourceTreeModel.removeEventListener(
SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavigated, this);
@@ -605,7 +605,8 @@ Network.NetworkLogView = class extends UI.VBox {
selectedRequestsNumber++;
selectedTransferSize += requestTransferSize;
}
- if (request.url() === request.target().inspectedURL() && request.resourceType() === Common.resourceTypes.Document)
+ if (request.url() === request.networkManager().target().inspectedURL() &&
+ request.resourceType() === Common.resourceTypes.Document)
baseTime = request.startTime;
if (request.endTime > maxTime)
maxTime = request.endTime;
@@ -1038,7 +1039,8 @@ Network.NetworkLogView = class extends UI.VBox {
// Pick provisional load requests.
var requestsToPick = [];
- var requests = NetworkLog.networkLog.requestsForTarget(frame.target());
+ var networkManager = frame.resourceTreeModel().target().model(SDK.NetworkManager);
+ var requests = networkManager ? NetworkLog.networkLog.requestsForManager(networkManager) : [];
for (var i = 0; i < requests.length; ++i) {
var request = requests[i];
if (request.loaderId === loaderId)

Powered by Google App Engine
This is Rietveld 408576698