DevTools: make StyleSourceMapping in charge of managing 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 60 matching lines @@
   /**
    * @param {!SDK.Target} target
    * @param {!Workspace.Workspace} workspace
    * @param {?SDK.ResourceTreeModel} resourceTreeModel
    */
   constructor(target, workspace, resourceTreeModel) {
     this._target = target;
     this._workspace = workspace;
     /** @type {!Map<string, !Bindings.ContentProviderBasedProject>} */
     this._workspaceProjects = new Map();
-    this._resourceTreeModel = resourceTreeModel;
     target[Bindings.NetworkProject._networkProjectSymbol] = this;
 
     this._eventListeners = [];
 
     if (resourceTreeModel) {
       this._eventListeners.push(
           resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.ResourceAdded, this._resourceAdded, this),
           resourceTreeModel.addEventListener(
               SDK.ResourceTreeModel.Events.FrameWillNavigate, this._frameWillNavigate, this),
           resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.FrameDetached, this._frameDetached, this));
     }
 
     this._debuggerModel = target.model(SDK.DebuggerModel);
     /** @type {!Set<!SDK.Script>} */
     this._acceptedScripts = new Set();
     if (this._debuggerModel) {
       var runtimeModel = this._debuggerModel.runtimeModel();
       this._eventListeners.push(
           runtimeModel.addEventListener(
               SDK.RuntimeModel.Events.ExecutionContextDestroyed, this._executionContextDestroyed, this),
           this._debuggerModel.addEventListener(
               SDK.DebuggerModel.Events.GlobalObjectCleared, this._globalObjectCleared, this),
           this._debuggerModel.addEventListener(
               SDK.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this),
           this._debuggerModel.addEventListener(
               SDK.DebuggerModel.Events.FailedToParseScriptSource, this._parsedScriptSource, this));
     }
-    var cssModel = target.model(SDK.CSSModel);
-    if (cssModel) {
-      this._eventListeners.push(
-          cssModel.addEventListener(SDK.CSSModel.Events.StyleSheetAdded, this._styleSheetAdded, this),
-          cssModel.addEventListener(SDK.CSSModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this));
-    }
   }
 
   /**
    * @param {!SDK.Target} target
    * @param {string} frameId
    * @param {boolean} isContentScripts
    * @return {string}
    */
   static projectId(target, frameId, isContentScripts) {
     return target.id() + ':' + frameId + ':' + (isContentScripts ? 'contentscripts' : '');
@@ skipping 92 matching lines @@
     var resourceTreeModel = target && target.model(SDK.ResourceTreeModel);
     var attribution = uiSourceCode[Bindings.NetworkProject._frameAttributionSymbol];
     if (!resourceTreeModel || !attribution)
       return [];
     var frames = Array.from(attribution.keys()).map(frameId => resourceTreeModel.frameForId(frameId));
     return frames.filter(frame => !!frame);
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
+   */
+  static forceCanonicalMimeType(uiSourceCode) {
+    uiSourceCode[Bindings.NetworkProject._forceCanonicalMimeType] = true;

[dgozman, 2017/05/17 16:46:20]

I feel like we should incorporate mime type into metadata. WDYT?

[lushnikov, 2017/05/20 01:24:18]

Done - here: https://codereview.chromium.org/2889013002/

+  }
+
+  /**
+   * @param {!Workspace.UISourceCode} uiSourceCode
    * @return {string}
    */
   static uiSourceCodeMimeType(uiSourceCode) {
-    if (uiSourceCode[Bindings.NetworkProject._scriptSymbol] || uiSourceCode[Bindings.NetworkProject._styleSheetSymbol])
+    if (uiSourceCode[Bindings.NetworkProject._forceCanonicalMimeType])
       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();
   }
 
   /**
@@ skipping 60 matching lines @@
    */
   _parsedScriptSource(event) {
     var script = /** @type {!SDK.Script} */ (event.data);
     if (!this._acceptsScript(script))
       return;
     this._acceptedScripts.add(script);
     var originalContentProvider = script.originalContentProvider();
     var frameId = Bindings.frameIdForScript(script);
     script[Bindings.NetworkProject._frameIdSymbol] = frameId;
     var uiSourceCode = this._createFile(originalContentProvider, frameId, script.isContentScript());
-    uiSourceCode[Bindings.NetworkProject._scriptSymbol] = script;
-    var metadata = this._fetchMetadata(frameId, uiSourceCode.url());
+    Bindings.NetworkProject.forceCanonicalMimeType(uiSourceCode);
+    var metadata = Bindings.metadataForURL(this._target, 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);
     this._removeScripts(scripts);
@@ skipping 13 matching lines @@
   }
 
   /**
    * @param {!Common.Event} event
    */
   _globalObjectCleared(event) {
     this._removeScripts(Array.from(this._acceptedScripts));
   }
 
   /**
-   * @param {!SDK.CSSStyleSheetHeader} header
-   */
-  _acceptsHeader(header) {
-    if (header.isInline && !header.hasSourceURL && header.origin !== 'inspector')
-      return false;
-    if (!header.resourceURL())
-      return false;
-    return true;
-  }
-
-  /**
-   * @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 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);
-  }
-
-  /**
    * @param {!Common.Event} event
    */
   _resourceAdded(event) {
     var resource = /** @type {!SDK.Resource} */ (event.data);
     this._addResource(resource);
   }
 
   /**
    * @param {!SDK.Resource} resource
    */
@@ skipping 65 matching lines @@
    */
   _createFile(contentProvider, frameId, isContentScript) {
     var url = contentProvider.contentURL();
     var project = this._workspaceProject(frameId, isContentScript);
     var uiSourceCode = project.createUISourceCode(url, contentProvider.contentType());
     if (frameId)
       Bindings.NetworkProject.setInitialFrameAttribution(uiSourceCode, frameId);
     return uiSourceCode;
   }
 
-  /**
-   * @param {string} frameId
-   * @param {string} url
-   * @return {?Workspace.UISourceCodeMetadata}
-   */
-  _fetchMetadata(frameId, url) {
-    if (!this._resourceTreeModel)
-      return null;
-    var frame = this._resourceTreeModel.frameForId(frameId);
-    if (!frame)
-      return null;
-    return Bindings.resourceMetadata(frame.resourceForURL(url));
-  }
-
   _dispose() {
     this._reset();
     Common.EventTarget.removeEventListeners(this._eventListeners);
     delete this._target[Bindings.NetworkProject._networkProjectSymbol];
   }
 
   _reset() {
     for (var project of this._workspaceProjects.values())
       project.removeProject();
     this._workspaceProjects.clear();
   }
 
   /**
+   * @param {!SDK.Target} target
+   * @param {!Workspace.Workspace} workspace
+   * @param {string} url
+   * @param {string} frameId
+   * @return {?Workspace.UISourceCode}
+   */
+  static uiSourceCodeForResourceURL(target, workspace, url, frameId) {
+    return workspace.uiSourceCode(Bindings.NetworkProject.projectId(target, frameId, false), url);
+  }
+
+  /**
    * @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 executionContext = script.executionContext();
     var frameId = executionContext ? executionContext.frameId || '' : '';
     return workspace.uiSourceCode(Bindings.NetworkProject.projectId(target, frameId, false), url) ||
         workspace.uiSourceCode(Bindings.NetworkProject.projectId(target, frameId, true), url);
   }
-
-  /**
-   * @param {!Workspace.Workspace} workspace
-   * @param {string} url
-   * @param {!SDK.CSSStyleSheetHeader} header
-   * @return {?Workspace.UISourceCode}
-   */
-  static uiSourceCodeForStyleURL(workspace, url, header) {
-    return workspace.uiSourceCode(
-        Bindings.NetworkProject.projectId(header.cssModel().target(), header.frameId, false), url);
-  }
-
-  /**
-   * @param {!Workspace.UISourceCode} uiSourceCode
-   * @return {?SDK.CSSStyleSheetHeader}
-   */
-  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._forceCanonicalMimeType = Symbol('Bindings.NetworkProject._forceCanonicalMimeType');
 Bindings.NetworkProject._targetSymbol = Symbol('target');
 Bindings.NetworkProject._frameIdSymbol = Symbol('frameid');
 
 Bindings.NetworkProject._frameAttributionSymbol = Symbol('Bindings.NetworkProject._frameAttributionSymbol');