DevTools: drastically simplify UISourceCode.checkContentUpdated

third_party/WebKit/Source/devtools/front_end/workspace/UISourceCode.js

 /*
  * Copyright (C) 2011 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 204 matching lines @@
       return Promise.resolve(this._content);
     var promise = this._requestContentPromise;
     if (!promise) {
       promise = new Promise(fulfill => this._requestContentCallback = fulfill);
       this._requestContentPromise = promise;
       this._project.requestFileContent(this, this._fireContentAvailable.bind(this));
     }
     return promise;
   }
 
-  /**
-   * @param {function()} callback
-   */
-  _pushCheckContentUpdatedCallback(callback) {
-    if (!this._checkContentUpdatedCallbacks)
-      this._checkContentUpdatedCallbacks = [];
-    this._checkContentUpdatedCallbacks.push(callback);
-  }
+  checkContentUpdated() {
+    if (!this._contentLoaded && !this._forceLoadOnCheckContent)
+      return;
 
-  _terminateContentCheck() {
-    delete this._checkingContent;
-    if (this._checkContentUpdatedCallbacks) {
-      this._checkContentUpdatedCallbacks.forEach(function(callback) {
-        callback();
-      });
-      delete this._checkContentUpdatedCallbacks;
-    }
-  }
-
-  /**
-   * @param {boolean=} forceLoad
-   * @param {function()=} callback
-   */
-  checkContentUpdated(forceLoad, callback) {
-    callback = callback || function() {};
-    forceLoad = forceLoad || this._forceLoadOnCheckContent;
-    if (!this.contentLoaded() && !forceLoad) {
-      callback();
-      return;
-    }
-
-    if (!this._project.canSetFileContent()) {
-      callback();
-      return;
-    }
-    this._pushCheckContentUpdatedCallback(callback);
-
-    if (this._checkingContent)
+    if (!this._project.canSetFileContent() || this._checkingContent)
       return;
 
     this._checkingContent = true;
     this._project.requestFileContent(this, contentLoaded.bind(this));
 
     /**
      * @param {?string} updatedContent
      * @this {Workspace.UISourceCode}
      */
     function contentLoaded(updatedContent) {
+      this._checkingContent = false;
       if (updatedContent === null) {
         var workingCopy = this.workingCopy();
         this._contentCommitted('', false);
         this.setWorkingCopy(workingCopy);
-        this._terminateContentCheck();
         return;
       }
-      if (typeof this._lastAcceptedContent === 'string' && this._lastAcceptedContent === updatedContent) {
-        this._terminateContentCheck();
+      if (typeof this._lastAcceptedContent === 'string' && this._lastAcceptedContent === updatedContent)
         return;
-      }
 
       if (this._content === updatedContent) {
         delete this._lastAcceptedContent;
-        this._terminateContentCheck();
         return;
       }
 
       if (!this.isDirty() || this._workingCopy === updatedContent) {
         this._contentCommitted(updatedContent, false);
-        this._terminateContentCheck();
         return;
       }
 
       var shouldUpdate =
           window.confirm(Common.UIString('This file was changed externally. Would you like to reload it?'));
       if (shouldUpdate)
         this._contentCommitted(updatedContent, false);
       else
         this._lastAcceptedContent = updatedContent;
-      this._terminateContentCheck();
     }
   }
 
   forceLoadOnCheckContent() {
     this._forceLoadOnCheckContent = true;
   }
 
   /**
    * @return {!Promise<?string>}
    */
@@ skipping 626 matching lines @@
 Workspace.UISourceCodeMetadata = class {
   /**
    * @param {?Date} modificationTime
    * @param {?number} contentSize
    */
   constructor(modificationTime, contentSize) {
     this.modificationTime = modificationTime;
     this.contentSize = contentSize;
   }
 };