[DevTools] Explicitly require ResourceTreeModel

third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org>
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 143 matching lines @@
         this._preserveLog = preserveLog;
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
         if (!target.parentTarget()) {
-            target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
-            target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._loadEventFired, this);
-            target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this);
+            var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
+            if (resourceTreeModel) {
+                resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
+                resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._loadEventFired, this);
+                resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this);
+            }
         }
         var networkLog = WebInspector.NetworkLog.fromTarget(target);
         if (networkLog)
             networkLog.requests().forEach(this._appendRequest.bind(this));
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target)
     {
         if (!target.parentTarget()) {
-            target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
-            target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._loadEventFired, this);
-            target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this);
+            var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
+            if (resourceTreeModel) {
+                resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
+                resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._loadEventFired, this);
+                resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this);
+            }
         }
     },
 
     /**
      * @param {number} start
      * @param {number} end
      */
     setWindow: function(start, end)
     {
         if (!start && !end) {
@@ skipping 192 matching lines @@
         var maxTime = -1;
         var nodes = this._nodesByRequestId.valuesArray();
         for (var i = 0; i < nodes.length; ++i) {
             var request = nodes[i].request();
             var requestTransferSize = request.transferSize;
             transferSize += requestTransferSize;
             if (!nodes[i][WebInspector.NetworkLogView._isFilteredOutSymbol]) {
                 selectedRequestsNumber++;
                 selectedTransferSize += requestTransferSize;
             }
-            if (request.url === request.target().resourceTreeModel.inspectedPageURL() && request.resourceType() === WebInspector.resourceTypes.Document)
+            var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(request.target());

[dgozman, 2016/07/22 17:19:43]

If the request is from SW, there might be no resource tree model.

[eostroukhov-old, 2016/07/25 19:36:10]

Done.

+            if (request.url === resourceTreeModel.inspectedPageURL() && request.resourceType() === WebInspector.resourceTypes.Document)
                 baseTime = request.startTime;
             if (request.endTime > maxTime)
                 maxTime = request.endTime;
         }
 
         var summaryBar = this._summaryBarElement;
         summaryBar.removeChildren();
         var separator = "\u2002\u2758\u2002";
         var text = "";
         /**
@@ skipping 1282 matching lines @@
         return false;
     return true;
 }
 
 WebInspector.NetworkLogView.EventTypes = {
     RequestSelected: "RequestSelected",
     SearchCountUpdated: "SearchCountUpdated",
     SearchIndexUpdated: "SearchIndexUpdated",
     UpdateRequest: "UpdateRequest"
 };