DevTools: Only provide static script content to UISourceCode

third_party/WebKit/Source/devtools/front_end/sdk/Script.js

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 53 matching lines @@
     this.columnOffset = startColumn;
     this.endLine = endLine;
     this.endColumn = endColumn;
 
     this._executionContextId = executionContextId;
     this.hash = hash;
     this._isContentScript = isContentScript;
     this._isLiveEdit = isLiveEdit;
     this.sourceMapURL = sourceMapURL;
     this.hasSourceURL = hasSourceURL;
+    this._originalContentPromise = null;
+    this._originalContentProvider = null;
   }
 
   /**
    * @param {string} source
    * @return {string}
    */
   static _trimSourceURLComment(source) {
     var sourceURLIndex = source.lastIndexOf('//# sourceURL=');
     if (sourceURLIndex === -1) {
       sourceURLIndex = source.lastIndexOf('//@ sourceURL=');
@@ skipping 95 matching lines @@
      * @param {?Protocol.Error} error
      * @param {string} source
      */
     function didGetScriptSource(error, source) {
       if (!error) {
         SDK.Script._reportDeprecatedCommentIfNeeded(this, source);
         this._source = SDK.Script._trimSourceURLComment(source);
       } else {
         this._source = '';
       }
       callback(this._source);

[pfeldman, 2017/02/15 23:33:38]

Can we just say this._originalSource = this._source; before this line?

[einbinder, 2017/02/16 00:12:36]

That will cache the content on first request, not first change.

     }
   }
 
   /**
+   * @return {!Common.ContentProvider}
+   */
+  originalContentProvider() {
+    if (!this._originalContentProvider) {

[pfeldman, 2017/02/15 23:33:38]

then you would say

var lazyContent = this._originalSource ? Promise.resolve(this._originalSource) :
this.requestContent();

and that would be it.

[einbinder, 2017/02/27 21:21:44]

StaticContent provider takes a function():Promise<string>, not a
Promise<string>. I can't bind the requestContent, because the content may have
changed between when the static content provider was created and the
requestContent is fired. So that's why the _requestOriginalContent method
exists.

+      var lazyContent = this.requestOriginalContent.bind(this);
+      this._originalContentProvider =
+          new Common.StaticContentProvider(this.contentURL(), this.contentType(), lazyContent);
+    }
+    return this._originalContentProvider;
+  }
+
+  /**
+   * @return {!Promise<?string>}
+   */
+  requestOriginalContent() {

[pfeldman, 2017/02/15 23:33:38]

And you would not need this.

[einbinder, 2017/02/16 00:12:36]

This can be private

+    if (!this._originalContentPromise)
+      this._originalContentPromise = this.requestContent();
+    return this._originalContentPromise;
+  }
+
+  /**
    * @override
    * @param {string} query
    * @param {boolean} caseSensitive
    * @param {boolean} isRegex
    * @param {function(!Array.<!Protocol.Debugger.SearchMatch>)} callback
    */
   searchInContent(query, caseSensitive, isRegex, callback) {
     /**
      * @param {?Protocol.Error} error
      * @param {!Array.<!Protocol.Debugger.SearchMatch>} searchMatches
@@ skipping 50 matching lines @@
         this._source = newSource;
       var needsStepIn = !!stackChanged;
       callback(error, exceptionDetails, callFrames, asyncStackTrace, needsStepIn);
     }
 
     newSource = SDK.Script._trimSourceURLComment(newSource);
     // We append correct sourceURL to script for consistency only. It's not actually needed for things to work correctly.
     newSource = this._appendSourceURLCommentIfNeeded(newSource);
 
     if (this.scriptId) {
-      this.debuggerModel.target().debuggerAgent().setScriptSource(
-          this.scriptId, newSource, undefined, didEditScriptSource.bind(this));
+      this.requestOriginalContent().then(
+          () => this.debuggerModel.target().debuggerAgent().setScriptSource(
+              this.scriptId, newSource, undefined, didEditScriptSource.bind(this)));
     } else {
       callback('Script failed to parse');
     }
   }
 
   /**
    * @param {number} lineNumber
    * @param {number=} columnNumber
    * @return {!SDK.DebuggerModel.Location}
    */
@@ skipping 53 matching lines @@
       function callback(error) {
         if (error)
           console.error(error);
         fulfill(!error);
       }
     }
   }
 };
 
 SDK.Script.sourceURLRegex = /^[\040\t]*\/\/[@#] sourceURL=\s*(\S*?)\s*$/m;