DevTools: prepare Navigator and Network Project for merging uiSourceCodes

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 109 matching lines @@
 
   /**
    * @param {!SDK.Target} target
    * @return {!Bindings.NetworkProject}
    */
   static forTarget(target) {
     return target[Bindings.NetworkProject._networkProjectSymbol];
   }
 
   /**
-   * @param {!Workspace.Project} project
-   * @return {?SDK.Target} target
+   * @param {!Workspace.UISourceCode} uiSourceCode
+   * @return {?Set<string>}
    */
-  static targetForProject(project) {
-    return project[Bindings.NetworkProject._targetSymbol] || null;
+  static frameAttribution(uiSourceCode) {
+    var frameId = uiSourceCode[Bindings.NetworkProject._frameAttributionSymbol];
+    return frameId ? new Set([frameId]) : null;
   }
 
   /**
-   * @param {!Workspace.Project} project
-   * @return {?SDK.ResourceTreeFrame}
-   */
-  static frameForProject(project) {
-    return project[Bindings.NetworkProject._frameSymbol] || null;
-  }
-
-  /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @return {?SDK.Target} target
    */
   static targetForUISourceCode(uiSourceCode) {
-    return uiSourceCode[Bindings.NetworkProject._targetSymbol] || null;
+    return uiSourceCode.project()[Bindings.NetworkProject._targetSymbol] || null;
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @return {string}
    */
   static uiSourceCodeMimeType(uiSourceCode) {
     if (uiSourceCode[Bindings.NetworkProject._scriptSymbol] || uiSourceCode[Bindings.NetworkProject._styleSheetSymbol])
       return uiSourceCode.contentType().canonicalMimeType();
 
@@ skipping 13 matching lines @@
     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] =
-        frameId && this._resourceTreeModel ? this._resourceTreeModel.frameForId(frameId) : null;
     this._workspaceProjects.set(projectId, project);
     return project;
   }
 
   /**
    * @param {!Common.ContentProvider} contentProvider
    * @param {string} frameId
    * @param {boolean} isContentScript
    * @param {?number} contentSize
    * @return {!Workspace.UISourceCode}
@@ skipping 79 matching lines @@
   _parsedScriptSource(event) {
     var script = /** @type {!SDK.Script} */ (event.data);
     if (!this._acceptsScript(script))
       return;
     var originalContentProvider = script.originalContentProvider();
     var executionContext = script.executionContext();
     var frameId = executionContext ? executionContext.frameId || '' : '';
     script[Bindings.NetworkProject._frameIdSymbol] = 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));
+    var metadata = this._fetchMetadata(frameId, uiSourceCode.url());
+    this._addUISourceCodeWithProvider(uiSourceCode, originalContentProvider, metadata);
   }
 
   /**
    * @param {!Common.Event} event
    */
   _executionContextDestroyed(event) {
     var executionContext = /** @type {!SDK.ExecutionContext} */ (event.data);
     var scripts = this._debuggerModel.scriptsForExecutionContext(executionContext);
     for (var script of scripts) {
       if (!this._acceptsScript(script))
@@ skipping 18 matching lines @@
    * @param {!Common.Event} event
    */
   _styleSheetAdded(event) {
     var header = /** @type {!SDK.CSSStyleSheetHeader} */ (event.data);
     if (!this._acceptsHeader(header))
       return;
 
     var originalContentProvider = header.originalContentProvider();
     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));
+    var metadata = this._fetchMetadata(header.frameId, uiSourceCode.url());
+    this._addUISourceCodeWithProvider(uiSourceCode, originalContentProvider, metadata);
   }
 
   /**
    * @param {!Common.Event} event
    */
   _styleSheetRemoved(event) {
     var header = /** @type {!SDK.CSSStyleSheetHeader} */ (event.data);
     if (!this._acceptsHeader(header))
       return;
     this._removeFileForURL(header.resourceURL(), header.frameId, false);
@@ skipping 27 matching lines @@
       return;
 
     // Never load document twice.
     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, resource.frameId, false);
     uiSourceCode[Bindings.NetworkProject._resourceSymbol] = resource;
-    this._addUISourceCodeWithProvider(uiSourceCode, resource, this._resourceMetadata(resource));
+    this._addUISourceCodeWithProvider(uiSourceCode, resource, Bindings.resourceMetadata(resource));
   }
 
   /**
    * @param {!SDK.ResourceTreeFrame} frame
    */
   _removeFrameResources(frame) {
     var project = this._workspaceProject(frame.id, false);
     for (var resource of frame.resources())
       project.removeUISourceCode(resource.url);
     project = this._workspaceProject(frame.id, true);
@@ skipping 34 matching lines @@
   /**
    * @param {!Common.ContentProvider} contentProvider
    * @param {string} frameId
    * @param {boolean} isContentScript
    * @return {!Workspace.UISourceCode}
    */
   _createFile(contentProvider, frameId, isContentScript) {
     var url = contentProvider.contentURL();
     var project = this._workspaceProject(frameId, isContentScript);
     var uiSourceCode = project.createUISourceCode(url, contentProvider.contentType());
-    uiSourceCode[Bindings.NetworkProject._targetSymbol] = this._target;
+    uiSourceCode[Bindings.NetworkProject._frameAttributionSymbol] = frameId;
     return uiSourceCode;
   }
 
   /**
-   * @param {?SDK.Resource} resource
+   * @param {string} frameId
+   * @param {string} url
    * @return {?Workspace.UISourceCodeMetadata}
    */
-  _resourceMetadata(resource) {
-    if (!resource || (typeof resource.contentSize() !== 'number' && !resource.lastModified()))
+  _fetchMetadata(frameId, url) {
+    if (!this._resourceTreeModel)
       return null;
-    return new Workspace.UISourceCodeMetadata(resource.lastModified(), resource.contentSize());
+    var frame = this._resourceTreeModel.frameForId(frameId);
+    var resource = frame ? frame.resourceForURL(url) : this._resourceTreeModel.resourceForURL(url);

[dgozman, 2017/04/20 17:12:07]

Why second part here? It's either from the frame or none!

[lushnikov, 2017/04/21 01:21:51]

Nailed it.

+    return Bindings.resourceMetadata(resource);
   }
 
   _dispose() {
     this._reset();
     Common.EventTarget.removeEventListeners(this._eventListeners);
     delete this._target[Bindings.NetworkProject._networkProjectSymbol];
   }
 
   _reset() {
     for (var project of this._workspaceProjects.values())
@@ skipping 33 matching lines @@
   static styleHeaderForUISourceCode(uiSourceCode) {
     return uiSourceCode[Bindings.NetworkProject._styleSheetSymbol];
   }
 };
 
 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');
-Bindings.NetworkProject._frameIdSymbol = Symbol('frameid');
+Bindings.NetworkProject._frameIdSymbol = Symbol('frameid');
+
+Bindings.NetworkProject._frameAttributionSymbol = Symbol('Bindings.NetworkProject._frameAttributionSymbol');