[DevTools] Do not report edited resources via Page.getResourceContent.

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 138 matching lines @@
  */
 WebInspector.NetworkProject = function(target, workspace, networkMapping)
 {
     WebInspector.SDKObject.call(this, target);
     this._workspace = workspace;
     this._networkMapping = networkMapping;
     this._projectDelegates = {};
     this._processedURLs = {};
     target[WebInspector.NetworkProject._networkProjectSymbol] = this;
 
-    target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
     target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
 
     var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
     if (debuggerModel) {
         debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this);
         debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.FailedToParseScriptSource, this._parsedScriptSource, this);
     }
     var cssModel = WebInspector.CSSStyleModel.fromTarget(target);
     if (cssModel) {
         cssModel.addEventListener(WebInspector.CSSStyleModel.Events.StyleSheetAdded, this._styleSheetAdded, this);
         cssModel.addEventListener(WebInspector.CSSStyleModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this);
     }
+
+    if (debuggerModel && !debuggerModel.debuggerEnabled())

[pfeldman, 2015/07/24 16:50:51]

Alright, so what you are doing here is you start listening to the network
requests after the debugger model has been enabled. This really does not make
sense to me. Network project is a network project, debugger project is a
debugger project.

+        debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerWasEnabled, this._debuggerEnabled, this);
+    else
+        this._debuggerEnabled();
 }
 
 WebInspector.NetworkProject._networkProjectSymbol = Symbol("networkProject");
 WebInspector.NetworkProject._contentTypeSymbol = Symbol("networkContentType");
 
 /**
  * @param {!WebInspector.Target} target
  * @param {string} projectURL
  * @param {boolean} isContentScripts
  * @return {string}
@@ skipping 85 matching lines @@
      */
     _removeFileForURL: function(url)
     {
         var splitURL = WebInspector.ParsedURL.splitURLIntoPathComponents(url);
         var projectURL = splitURL[0];
         var path = splitURL.slice(1).join("/");
         var projectDelegate = this._projectDelegates[WebInspector.NetworkProject.projectId(this.target(), projectURL, false)];
         projectDelegate.removeFile(path);
     },
 
+    _debuggerEnabled: function()
+    {
+        var debuggerModel = WebInspector.DebuggerModel.fromTarget(this.target());
+        if (debuggerModel)
+            debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerWasEnabled, this._debuggerEnabled, this);
+        this._populate();
+        this.target().resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
+    },
+
     _populate: function()
     {
         /**
          * @param {!WebInspector.ResourceTreeFrame} frame
          * @this {WebInspector.NetworkProject}
          */
         function populateFrame(frame)
         {
             for (var i = 0; i < frame.childFrames.length; ++i)
                 populateFrame.call(this, frame.childFrames[i]);
@@ skipping 99 matching lines @@
     },
 
     _dispose: function()
     {
         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 debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
         if (debuggerModel) {
+            debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerWasEnabled, this._debuggerEnabled, this);
             debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this);
             debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.FailedToParseScriptSource, this._parsedScriptSource, this);
         }
         var cssModel = WebInspector.CSSStyleModel.fromTarget(target);
         if (cssModel) {
             cssModel.removeEventListener(WebInspector.CSSStyleModel.Events.StyleSheetAdded, this._styleSheetAdded, this);
             cssModel.removeEventListener(WebInspector.CSSStyleModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this);
         }
     },
 
@@ skipping 38 matching lines @@
         return this._resource.resourceType();
     },
 
     /**
      * @override
      * @param {function(?string)} callback
      */
     requestContent: function(callback)
     {
         /**
-         * @this {WebInspector.NetworkProject.FallbackResource}
+         * @param {!WebInspector.Target} target
+         * @param {string} url
+         * @return {!Array.<!WebInspector.Script>}
          */
-        function loadFallbackContent()
+        function findScripts(target, url)
         {
-            var debuggerModel = WebInspector.DebuggerModel.fromTarget(this._resource.target());
-            if (!debuggerModel) {
-                callback(null);
-                return;
-            }
-            var scripts = debuggerModel.scriptsForSourceURL(this._resource.url);
-            if (!scripts.length) {
-                callback(null);
-                return;
-            }
-
-            var contentProvider;
-            var type = this._resource.resourceType();
-            if (type === WebInspector.resourceTypes.Document)
-                contentProvider = new WebInspector.ConcatenatedScriptsContentProvider(scripts);
-            else if (type === WebInspector.resourceTypes.Script)
-                contentProvider = scripts[0];
-
-            console.assert(contentProvider, "Resource content request failed. " + this._resource.url);
-
-            contentProvider.requestContent(callback);
+            var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
+            return debuggerModel ? debuggerModel.scriptsForSourceURL(url) : [];
         }
 
         /**
          * @param {?string} content
          * @this {WebInspector.NetworkProject.FallbackResource}
          */
-        function requestContentLoaded(content)
+        function loadFallbackContent(content)
         {
-            if (content)
-                callback(content)
+            if (content) {
+                callback(content);

[sergeyv, 2015/07/20 08:40:58]

Looks like you are going to have a stale content for edited scripts after a
reopening of DevTools.

[sergeyv, 2015/07/20 08:45:55]

Sorry, I mixed up brackets. That's not correct 

+                return;
+            }
+
+            if (this._resource.resourceType() !== WebInspector.resourceTypes.Document) {
+                callback(null);
+                return;
+            }
+
+            var scripts = findScripts(this._resource.target(), this._resource.url);
+            if (scripts.length)
+                new WebInspector.ConcatenatedScriptsContentProvider(scripts).requestContent(callback);
             else
-                loadFallbackContent.call(this);
+                callback(null);
         }
 
-        this._resource.requestContent(requestContentLoaded.bind(this));
+        if (this._resource.resourceType() === WebInspector.resourceTypes.Script) {
+            var scripts = findScripts(this._resource.target(), this._resource.url);
+            if (scripts.length) {
+                scripts[0].requestContent(callback);
+                return;
+            }
+        }
+
+        this._resource.requestContent(loadFallbackContent.bind(this));
     },
 
     /**
      * @override
      * @param {string} query
      * @param {boolean} caseSensitive
      * @param {boolean} isRegex
      * @param {function(!Array.<!WebInspector.ContentProvider.SearchMatch>)} callback
      */
     searchInContent: function(query, caseSensitive, isRegex, callback)
@@ skipping 13 matching lines @@
         }
 
         if (this.contentType() === WebInspector.resourceTypes.Document) {
             this.requestContent(documentContentLoaded);
             return;
         }
 
         this._resource.searchInContent(query, caseSensitive, isRegex, callback);
     }
 }