[DevTools] Make resource tree model optional

third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js

Index: third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
index 6adf7e31a578bbc5d979d662f98fe60959fbdd9b..e37fb6d68f81f50319e35f34147b8677435e918a 100644
--- a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
+++ b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
@@ -78,9 +78,12 @@ WebInspector.NetworkProject = function(target, workspace, networkMapping)
     this._workspaceProjects = new Map();
     target[WebInspector.NetworkProject._networkProjectSymbol] = this;
 
-    target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
-    target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameWillNavigate, this._frameWillNavigate, this);
-    target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
+    var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
+    if (resourceTreeModel) {
+        resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
+        resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameWillNavigate, this._frameWillNavigate, this);
+        resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
+    }
 
     var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
     if (debuggerModel) {
@@ -166,40 +169,6 @@ WebInspector.NetworkProject.uiSourceCodeMimeType = function(uiSourceCode)
     return mimeType || uiSourceCode.contentType().canonicalMimeType();
 }
 
-/**
- * @param {!WebInspector.UISourceCode} uiSourceCode
- * @return {?WebInspector.ResourceTreeFrame}
- */
-WebInspector.NetworkProject.uiSourceCodeFrame = function(uiSourceCode)

[pfeldman, 2016/07/13 23:55:57]

Thanks.

-{
-    var target = uiSourceCode[WebInspector.NetworkProject._targetSymbol];
-    if (!target)
-        return null;
-
-    var frameId;
-
-    var script = uiSourceCode[WebInspector.NetworkProject._scriptSymbol];
-    if (script) {
-        var executionContext = script.executionContext();
-        if (executionContext)
-            frameId = executionContext.frameId;
-    }
-
-    if (!frameId) {
-        var header = uiSourceCode[WebInspector.NetworkProject._styleSheetSymbol];
-        if (header)
-            frameId = header.frameId;
-    }
-
-    if (!frameId) {
-        var resource = uiSourceCode[WebInspector.NetworkProject._resourceSymbol];
-        if (resource)
-            frameId = resource.frameId;
-    }
-
-    return frameId ? target.resourceTreeModel.frameForId(frameId) : null;
-}
-
 WebInspector.NetworkProject.prototype = {
     /**
      * @param {?WebInspector.ResourceTreeFrame} frame
@@ -264,7 +233,8 @@ WebInspector.NetworkProject.prototype = {
                 this._addResource(resources[i]);
         }
 
-        var mainFrame = this.target().resourceTreeModel.mainFrame;
+        var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(this.target());
+        var mainFrame = resourceTreeModel && resourceTreeModel.mainFrame;
         if (mainFrame)
             populateFrame.call(this, mainFrame);
     },
@@ -423,8 +393,12 @@ WebInspector.NetworkProject.prototype = {
     {
         this._reset();
         var target = this.target();
-        target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
-        target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
+        var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
+        if (resourceTreeModel) {
+            resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
+            resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameWillNavigate, this._frameWillNavigate, this);
+            resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
+        }
         var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
         if (debuggerModel) {
             debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this);