DevTools: remove SDK.ResourceTreeFrame.fromXXX methods

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

 /*
  * Copyright (C) 2012 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 88 matching lines @@
       this._eventListeners.push(
           cssModel.addEventListener(SDK.CSSModel.Events.StyleSheetAdded, this._styleSheetAdded, this),
           cssModel.addEventListener(SDK.CSSModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this));
     }
     this._eventListeners.push(target.targetManager().addEventListener(
         SDK.TargetManager.Events.SuspendStateChanged, this._suspendStateChanged, this));
   }
 
   /**
    * @param {!SDK.Target} target
-   * @param {?SDK.ResourceTreeFrame} frame
+   * @param {string} frameId
    * @param {boolean} isContentScripts
    * @return {string}
    */
-  static projectId(target, frame, isContentScripts) {
-    return target.id() + ':' + (frame ? frame.id : '') + ':' + (isContentScripts ? 'contentscripts' : '');
+  static projectId(target, frameId, isContentScripts) {
+    return target.id() + ':' + frameId + ':' + (isContentScripts ? 'contentscripts' : '');
   }
 
   /**
    * @param {!SDK.Target} target
    * @return {!Bindings.NetworkProject}
    */
   static forTarget(target) {
     return target[Bindings.NetworkProject._networkProjectSymbol];
   }
 
@@ skipping 30 matching lines @@
       return uiSourceCode.contentType().canonicalMimeType();
 
     var resource = uiSourceCode[Bindings.NetworkProject._resourceSymbol];
     if (resource)
       return resource.mimeType;
     var mimeType = Common.ResourceType.mimeFromURL(uiSourceCode.url());
     return mimeType || uiSourceCode.contentType().canonicalMimeType();
   }
 
   /**
-   * @param {?SDK.ResourceTreeFrame} frame
+   * @param {string} frameId
    * @param {boolean} isContentScripts
    * @return {!Bindings.ContentProviderBasedProject}
    */
-  _workspaceProject(frame, isContentScripts) {
-    var projectId = Bindings.NetworkProject.projectId(this.target(), frame, isContentScripts);
+  _workspaceProject(frameId, isContentScripts) {
+    var projectId = Bindings.NetworkProject.projectId(this.target(), frameId, isContentScripts);
     var projectType = isContentScripts ? Workspace.projectTypes.ContentScripts : Workspace.projectTypes.Network;
 
     var project = this._workspaceProjects.get(projectId);
     if (project)
       return project;
 
     project = new Bindings.ContentProviderBasedProject(
         this._workspace, projectId, projectType, '', false /* isServiceProject */);
     project[Bindings.NetworkProject._targetSymbol] = this.target();
-    project[Bindings.NetworkProject._frameSymbol] = frame;
+    project[Bindings.NetworkProject._frameSymbol] =
+        frameId && this._resourceTreeModel ? this._resourceTreeModel.frameForId(frameId) : null;
     this._workspaceProjects.set(projectId, project);
     return project;
   }
 
   /**
    * @param {!Common.ContentProvider} contentProvider
-   * @param {?SDK.ResourceTreeFrame} frame
+   * @param {string} frameId
    * @param {boolean} isContentScript
    * @param {?number} contentSize
    * @return {!Workspace.UISourceCode}
    */
-  addSourceMapFile(contentProvider, frame, isContentScript, contentSize) {
-    var uiSourceCode = this._createFile(contentProvider, frame, isContentScript || false);
+  addSourceMapFile(contentProvider, frameId, isContentScript, contentSize) {
+    var uiSourceCode = this._createFile(contentProvider, frameId, isContentScript || false);
     var metadata = typeof contentSize === 'number' ? new Workspace.UISourceCodeMetadata(null, contentSize) : null;
     this._addUISourceCodeWithProvider(uiSourceCode, contentProvider, metadata);
     return uiSourceCode;
   }
 
   /**
-   * @param {?SDK.ResourceTreeFrame} frame
    * @param {string} url
+   * @param {string} frameId
+   * @param {boolean} isContentScript
    */
-  _removeFileForURL(frame, url) {
-    var project = this._workspaceProjects.get(Bindings.NetworkProject.projectId(this.target(), frame, false));
+  removeSourceMapFile(url, frameId, isContentScript) {
+    this._removeFileForURL(frameId, url, isContentScript);
+  }
+
+  /**
+   * @param {string} frameId
+   * @param {string} url
+   * @param {boolean} isContentScript
+   */
+  _removeFileForURL(frameId, url, isContentScript) {
+    var project =
+        this._workspaceProjects.get(Bindings.NetworkProject.projectId(this.target(), frameId, isContentScript));
     if (!project)
       return;
     project.removeFile(url);
   }
 
   _populate() {
     /**
      * @param {!SDK.ResourceTreeFrame} frame
      * @this {Bindings.NetworkProject}
      */
@@ skipping 29 matching lines @@
     var script = /** @type {!SDK.Script} */ (event.data);
     if (!script.sourceURL || script.isLiveEdit() || (script.isInlineScript() && !script.hasSourceURL))
       return;
     // Filter out embedder injected content scripts.
     if (script.isContentScript() && !script.hasSourceURL) {
       var parsedURL = new Common.ParsedURL(script.sourceURL);
       if (!parsedURL.isValid)
         return;
     }
     var originalContentProvider = script.originalContentProvider();
-    var uiSourceCode =
-        this._createFile(originalContentProvider, SDK.ResourceTreeFrame.fromScript(script), script.isContentScript());
+    var executionContext = script.executionContext();
+    var frameId = executionContext ? executionContext.frameId || '' : '';
+    var uiSourceCode = this._createFile(originalContentProvider, frameId, script.isContentScript());
     uiSourceCode[Bindings.NetworkProject._scriptSymbol] = script;
     var resource = SDK.ResourceTreeModel.resourceForURL(uiSourceCode.url());
     this._addUISourceCodeWithProvider(uiSourceCode, originalContentProvider, this._resourceMetadata(resource));
   }
 
   /**
    * @param {!Common.Event} event
    */
   _styleSheetAdded(event) {
     var header = /** @type {!SDK.CSSStyleSheetHeader} */ (event.data);
     if (header.isInline && !header.hasSourceURL && header.origin !== 'inspector')
       return;
     if (!header.resourceURL())
       return;
 
     var originalContentProvider = header.originalContentProvider();
-    var uiSourceCode = this._createFile(originalContentProvider, SDK.ResourceTreeFrame.fromStyleSheet(header), false);
+    var uiSourceCode = this._createFile(originalContentProvider, header.frameId, false);
     uiSourceCode[Bindings.NetworkProject._styleSheetSymbol] = header;
     var resource = SDK.ResourceTreeModel.resourceForURL(uiSourceCode.url());
     this._addUISourceCodeWithProvider(uiSourceCode, originalContentProvider, this._resourceMetadata(resource));
   }
 
   /**
    * @param {!Common.Event} event
    */
   _styleSheetRemoved(event) {
     var header = /** @type {!SDK.CSSStyleSheetHeader} */ (event.data);
     if (header.isInline && !header.hasSourceURL && header.origin !== 'inspector')
       return;
 
-    this._removeFileForURL(SDK.ResourceTreeFrame.fromStyleSheet(header), header.resourceURL());
+    this._removeFileForURL(header.frameId, header.resourceURL(), false);
   }
 
   /**
    * @param {!Common.Event} event
    */
   _resourceAdded(event) {
     var resource = /** @type {!SDK.Resource} */ (event.data);
     this._addResource(resource);
   }
 
@@ skipping 10 matching lines @@
 
     // Ignore non-images and non-fonts.
     if (resourceType === Common.resourceTypes.Image && resource.mimeType && !resource.mimeType.startsWith('image'))
       return;
     if (resourceType === Common.resourceTypes.Font && resource.mimeType && !resource.mimeType.includes('font'))
       return;
     if ((resourceType === Common.resourceTypes.Image || resourceType === Common.resourceTypes.Font) &&
         resource.contentURL().startsWith('data:'))
       return;
 
-    var frame = SDK.ResourceTreeFrame.fromResource(resource);
     // Never load document twice.
-    var projectId = Bindings.NetworkProject.projectId(this.target(), frame, false);
+    var projectId = Bindings.NetworkProject.projectId(this.target(), resource.frameId, false);
     var project = this._workspaceProjects.get(projectId);
     if (project && project.uiSourceCodeForURL(resource.url))
       return;
 
-    var uiSourceCode = this._createFile(resource, frame, false);
+    var uiSourceCode = this._createFile(resource, resource.frameId, false);
     uiSourceCode[Bindings.NetworkProject._resourceSymbol] = resource;
     this._addUISourceCodeWithProvider(uiSourceCode, resource, this._resourceMetadata(resource));
   }
 
   /**
    * @param {!SDK.ResourceTreeFrame} frame
    */
   _removeFrameResources(frame) {
-    var project = this._workspaceProject(frame, false);
+    var frameId = frame ? frame.id : '';

[dgozman, 2017/03/17 19:00:21]

frame is annotated as non-null here.

[lushnikov, 2017/03/17 21:21:47]

Done.

+    var project = this._workspaceProject(frameId, false);
     for (var resource of frame.resources())
       project.removeUISourceCode(resource.url);
-    project = this._workspaceProject(frame, true);
+    project = this._workspaceProject(frameId, true);
     for (var resource of frame.resources())
       project.removeUISourceCode(resource.url);
   }
 
   /**
    * @param {!Common.Event} event
    */
   _frameWillNavigate(event) {
     var frame = /** @type {!SDK.ResourceTreeFrame} */ (event.data);
     this._removeFrameResources(frame);
@@ skipping 16 matching lines @@
 
   _suspendStateChanged() {
     if (this.target().targetManager().allTargetsSuspended())
       this._reset();
     else
       this._populate();
   }
 
   /**
    * @param {!Common.ContentProvider} contentProvider
-   * @param {?SDK.ResourceTreeFrame} frame
+   * @param {string} frameId
    * @param {boolean} isContentScript
    * @return {!Workspace.UISourceCode}
    */
-  _createFile(contentProvider, frame, isContentScript) {
+  _createFile(contentProvider, frameId, isContentScript) {
     var url = contentProvider.contentURL();
-    var project = this._workspaceProject(frame, isContentScript);
+    var project = this._workspaceProject(frameId, isContentScript);
     var uiSourceCode = project.createUISourceCode(url, contentProvider.contentType());
     uiSourceCode[Bindings.NetworkProject._targetSymbol] = this.target();
     return uiSourceCode;
   }
 
   /**
    * @param {?SDK.Resource} resource
    * @return {?Workspace.UISourceCodeMetadata}
    */
   _resourceMetadata(resource) {
@@ skipping 15 matching lines @@
   }
 
   /**
    * @param {!Workspace.Workspace} workspace
    * @param {string} url
    * @param {!SDK.Script} script
    * @return {?Workspace.UISourceCode}
    */
   static uiSourceCodeForScriptURL(workspace, url, script) {
     var target = script.debuggerModel.target();
     var frame = SDK.ResourceTreeFrame.fromScript(script);

[dgozman, 2017/03/17 19:00:21]

Get the frameId manually similar to the _parsedScriptSource?

[lushnikov, 2017/03/17 21:21:47]

Done.

-    return workspace.uiSourceCode(Bindings.NetworkProject.projectId(target, frame, false), url) ||
-        workspace.uiSourceCode(Bindings.NetworkProject.projectId(target, frame, true), url);
+    return workspace.uiSourceCode(Bindings.NetworkProject.projectId(target, frame ? frame.id : '', false), url) ||
+        workspace.uiSourceCode(Bindings.NetworkProject.projectId(target, frame ? frame.id : '', true), url);
   }
 
   /**
    * @param {!Workspace.Workspace} workspace
    * @param {string} url
    * @param {!SDK.CSSStyleSheetHeader} header
    * @return {?Workspace.UISourceCode}
    */
   static uiSourceCodeForStyleURL(workspace, url, header) {
-    var frame = SDK.ResourceTreeFrame.fromStyleSheet(header);
-    return workspace.uiSourceCode(Bindings.NetworkProject.projectId(header.target(), frame, false), url);
+    return workspace.uiSourceCode(Bindings.NetworkProject.projectId(header.target(), header.frameId, false), url);
   }
 };
 
 Bindings.NetworkProject._networkProjectSymbol = Symbol('networkProject');
 Bindings.NetworkProject._resourceSymbol = Symbol('resource');
 Bindings.NetworkProject._scriptSymbol = Symbol('script');
 Bindings.NetworkProject._styleSheetSymbol = Symbol('styleSheet');
 Bindings.NetworkProject._targetSymbol = Symbol('target');
 Bindings.NetworkProject._frameSymbol = Symbol('frame');