DevTools: WI.SourceCodeDiff should not depend on UISourceCode

third_party/WebKit/Source/devtools/front_end/sources/UISourceCodeFrame.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:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 19 matching lines @@
  * @constructor
  * @extends {WebInspector.SourceFrame}
  * @param {!WebInspector.UISourceCode} uiSourceCode
  */
 WebInspector.UISourceCodeFrame = function(uiSourceCode)
 {
     this._uiSourceCode = uiSourceCode;
     WebInspector.SourceFrame.call(this, uiSourceCode.contentURL(), workingCopy);
 
     if (Runtime.experiments.isEnabled("sourceDiff"))
-        this._diff = new WebInspector.SourceCodeDiff(uiSourceCode, this.textEditor);
+        this._diff = new WebInspector.SourceCodeDiff(uiSourceCode.requestOriginalContent(), this.textEditor);
     this.textEditor.setAutocompleteDelegate(new WebInspector.SimpleAutocompleteDelegate());
 
     this._rowMessageBuckets = {};
     /** @type {!Set<string>} */
     this._typeDecorationsPending = new Set();
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._onWorkingCopyChanged, this);
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._onWorkingCopyCommitted, this);
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.MessageAdded, this._onMessageAdded, this);
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.MessageRemoved, this._onMessageRemoved, this);
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.LineDecorationAdded, this._onLineDecorationAdded, this);
@@ skipping 75 matching lines @@
         this._muteSourceCodeEvents = true;
         this._uiSourceCode.commitWorkingCopy();
         delete this._muteSourceCodeEvents;
     },
 
     /**
      * @override
      */
     onTextEditorContentLoaded: function()
     {
+        if (this._diff)
+            this._diff.updateDiffMarkersImmediately();
         WebInspector.SourceFrame.prototype.onTextEditorContentLoaded.call(this);
         for (var message of this._uiSourceCode.messages())
             this._addMessageToSource(message);
         this._decorateAllTypes();
     },
 
     /**
      * @override
      * @param {!WebInspector.TextRange} oldRange
      * @param {!WebInspector.TextRange} newRange
      */
     onTextChanged: function(oldRange, newRange)
     {
+        if (this._diff)
+            this._diff.updateDiffMarkersWhenPossible();
         WebInspector.SourceFrame.prototype.onTextChanged.call(this, oldRange, newRange);
         this._clearMessages();
         if (this._isSettingContent)
             return;
         this._muteSourceCodeEvents = true;
         if (this._textEditor.isClean())
             this._uiSourceCode.resetWorkingCopy();
         else
             this._uiSourceCode.setWorkingCopyGetter(this._textEditor.text.bind(this._textEditor));
         delete this._muteSourceCodeEvents;
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _onWorkingCopyChanged: function(event)
     {
-        if (this._diff)
-            this._diff.updateDiffMarkersWhenPossible();
         if (this._muteSourceCodeEvents)
             return;
         this._innerSetContent(this._uiSourceCode.workingCopy());
         this.onUISourceCodeContentChanged();
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _onWorkingCopyCommitted: function(event)
     {
         if (!this._muteSourceCodeEvents) {
             this._innerSetContent(this._uiSourceCode.workingCopy());
             this.onUISourceCodeContentChanged();
         }
         this._textEditor.markClean();
         this._updateStyle();
-        if (this._diff)
-            this._diff.updateDiffMarkersWhenPossible();
     },
 
     _updateStyle: function()
     {
         this.element.classList.toggle("source-frame-unsaved-committed-changes", this._uiSourceCode.hasUnsavedCommittedChanges());
     },
 
     onUISourceCodeContentChanged: function()
     {
     },
 
     /**
      * @param {string} content
      */
     _innerSetContent: function(content)
     {
         this._isSettingContent = true;
         if (this._diff) {
             var oldContent = this._textEditor.text();
             this.setContent(content);
-            this._diff.updateDiffMarkersImmediately();
             this._diff.highlightModifiedLines(oldContent, content);
         } else {
             this.setContent(content);
         }
         delete this._isSettingContent;
     },
 
     /**
      * @override
      * @return {!Promise}
@@ skipping 410 matching lines @@
 
 /**
  * @param {!WebInspector.UISourceCode.Message} a
  * @param {!WebInspector.UISourceCode.Message} b
  * @return {number}
  */
 WebInspector.UISourceCode.Message.messageLevelComparator = function(a, b)
 {
     return WebInspector.UISourceCode.Message._messageLevelPriority[a.level()] - WebInspector.UISourceCode.Message._messageLevelPriority[b.level()];
 }