[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 226 matching lines @@
         var projectType = isContentScripts ? WebInspector.projectTypes.ContentScripts : WebInspector.projectTypes.Network;
 
         if (this._projectDelegates[projectId])
             return this._projectDelegates[projectId];
         var projectDelegate = new WebInspector.NetworkProjectDelegate(this.target(), this._workspace, projectId, projectURL, projectType);
         this._projectDelegates[projectId] = projectDelegate;
         return projectDelegate;
     },
 
     /**
+     * @param {!WebInspector.Resource} resource
+     * @return {!WebInspector.ContentProvider}
+     */
+    _contentProviderForResource: function(resource)
+    {
+        return resource.resourceType() === WebInspector.resourceTypes.Document ? new WebInspector.NetworkProject.DocumentFallbackResource(resource) : resource;

[pfeldman, 2015/08/11 23:22:43]

Lets use this opportunity to nuke the concatenated resource. All you need here
is a plain HTML resource.

[dgozman, 2015/08/12 23:22:11]

Done.

+    },
+
+    /**
      * @param {string} url
      * @param {!WebInspector.ContentProvider} contentProvider
      * @param {boolean=} isContentScript
      * @return {!WebInspector.UISourceCode}
      */
     addFileForURL: function(url, contentProvider, isContentScript)
     {
         var splitURL = WebInspector.ParsedURL.splitURLIntoPathComponents(url);
         var projectURL = splitURL[0];
         var parentPath = splitURL.slice(1, -1).join("/");
@@ skipping 23 matching lines @@
          * @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]);
 
             var resources = frame.resources();
             for (var i = 0; i < resources.length; ++i)
-                this._addFile(resources[i].url, new WebInspector.NetworkProject.FallbackResource(resources[i]));
+                this._addFile(resources[i].url, this._contentProviderForResource(resources[i]));
         }
 
         var mainFrame = this.target().resourceTreeModel.mainFrame;
         if (mainFrame)
             populateFrame.call(this, mainFrame);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
@@ skipping 34 matching lines @@
 
         this._removeFile(header.resourceURL());
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _resourceAdded: function(event)
     {
         var resource = /** @type {!WebInspector.Resource} */ (event.data);
-        this._addFile(resource.url, new WebInspector.NetworkProject.FallbackResource(resource));
+        if (resource.resourceType() === WebInspector.resourceTypes.Script || resource.resourceType() === WebInspector.resourceTypes.Stylesheet)

[pfeldman, 2015/08/11 23:22:43]

Why would we do anything upon resourceAdded? I thought we agreed upon nuking it
altogether.

[dgozman, 2015/08/12 23:22:11]

Done.

+            return;
+        this._addFile(resource.url, this._contentProviderForResource(resource));
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _mainFrameNavigated: function(event)
     {
         this._reset();
         this._populate();
     },
@@ skipping 56 matching lines @@
     },
 
     __proto__: WebInspector.SDKObject.prototype
 }
 
 /**
  * @constructor
  * @implements {WebInspector.ContentProvider}
  * @param {!WebInspector.Resource} resource
  */
-WebInspector.NetworkProject.FallbackResource = function(resource)
+WebInspector.NetworkProject.DocumentFallbackResource = function(resource)
 {
+    console.assert(resource.resourceType() === WebInspector.resourceTypes.Document);
     this._resource = resource;
 }
 
-WebInspector.NetworkProject.FallbackResource.prototype = {
+WebInspector.NetworkProject.DocumentFallbackResource.prototype = {
 
     /**
      * @override
      * @return {string}
      */
     contentURL: function()
     {
         return this._resource.contentURL();
     },
 
     /**
      * @override
      * @return {!WebInspector.ResourceType}
      */
     contentType: function()
     {
         return this._resource.resourceType();
     },
 
     /**
      * @override
      * @param {function(?string)} callback
      */
     requestContent: function(callback)
     {
         /**
-         * @this {WebInspector.NetworkProject.FallbackResource}
+         * @param {?string} content
+         * @this {WebInspector.NetworkProject.DocumentFallbackResource}
          */
-        function loadFallbackContent()
+        function loadFallbackContent(content)
         {
-            var debuggerModel = WebInspector.DebuggerModel.fromTarget(this._resource.target());
-            if (!debuggerModel) {
-                callback(null);
+            if (content) {
+                callback(content);
                 return;
             }
-            var scripts = debuggerModel.scriptsForSourceURL(this._resource.url);
+
+            var debuggerModel = WebInspector.DebuggerModel.fromTarget(this._resource.target());
+            var scripts = debuggerModel ? 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);
+            new WebInspector.ConcatenatedScriptsContentProvider(scripts).requestContent(callback);
         }
 
-        /**
-         * @param {?string} content
-         * @this {WebInspector.NetworkProject.FallbackResource}
-         */
-        function requestContentLoaded(content)
-        {
-            if (content)
-                callback(content)
-            else
-                loadFallbackContent.call(this);
-        }
-
-        this._resource.requestContent(requestContentLoaded.bind(this));
+        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)
     {
         /**
          * @param {?string} content
          */
         function documentContentLoaded(content)
         {
             if (content === null) {
                 callback([]);
                 return;
             }
 
             var result = WebInspector.ContentProvider.performSearchInContent(content, query, caseSensitive, isRegex);
             callback(result);
         }
 
-        if (this.contentType() === WebInspector.resourceTypes.Document) {
-            this.requestContent(documentContentLoaded);
-            return;
-        }
-
-        this._resource.searchInContent(query, caseSensitive, isRegex, callback);
+        this.requestContent(documentContentLoaded);
     }
 }