DevTools: Make sure UISC content is up-to-date when running performSearchInContent()

Source/devtools/front_end/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 244 matching lines @@
         if (this._content || this._contentLoaded) {
             callback(this._content);
             return;
         }
         this._requestContentCallbacks.push(callback);
         if (this._requestContentCallbacks.length === 1)
             this._project.requestFileContent(this, this._fireContentAvailable.bind(this));
     },
 
     /**
-     * @param {function()=} callback
+     * @param {function(boolean)=} callback

[vsevik, 2014/03/28 16:18:36]

Looks like this parameter is never used, why do you add it?

[apavlov, 2014/03/30 13:02:09]

Previously, not all paths would invoke the callback, now all of them do, but the
the this._checkingContent case the result is not actually valid. Fine with
dropping it for now.

      */
     checkContentUpdated: function(callback)
     {
-        if (!this._project.canSetFileContent())
+        callback = callback || function() {};
+        if (this._checkingContent) {

[vsevik, 2014/03/28 16:18:36]

Why did you swap the conditionals?

[apavlov, 2014/03/30 13:02:09]

This happened after a few steps of refactoring :)

+            callback(false);
             return;
-        if (this._checkingContent)
+        }
+        if (!this._project.canSetFileContent()) {
+            callback(true);
             return;
+        }
         this._checkingContent = true;
         this._project.requestFileContent(this, contentLoaded.bind(this));
 
         /**
          * @param {?string} updatedContent
          * @this {WebInspector.UISourceCode}
          */
         function contentLoaded(updatedContent)
         {
             if (updatedContent === null) {
                 var workingCopy = this.workingCopy();
                 this._commitContent("", false);
                 this.setWorkingCopy(workingCopy);
                 delete this._checkingContent;
-                if (callback)
-                    callback();
+                callback(true);
                 return;
             }
             if (typeof this._lastAcceptedContent === "string" && this._lastAcceptedContent === updatedContent) {
                 delete this._checkingContent;
-                if (callback)
-                    callback();
+                callback(true);
                 return;
             }
             if (this._content === updatedContent) {
                 delete this._lastAcceptedContent;
                 delete this._checkingContent;
-                if (callback)
-                    callback();
+                callback(true);
                 return;
             }
 
             if (!this.isDirty()) {
                 this._commitContent(updatedContent, false);
                 delete this._checkingContent;
-                if (callback)
-                    callback();
+                callback(true);
                 return;
             }
 
             var shouldUpdate = window.confirm(WebInspector.UIString("This file was changed externally. Would you like to reload it?"));
             if (shouldUpdate)
                 this._commitContent(updatedContent, false);
             else
                 this._lastAcceptedContent = updatedContent;
             delete this._checkingContent;
-            if (callback)
-                callback();
+            callback(true);
         }
     },
 
     /**
      * @param {function(?string)} callback
      */
     requestOriginalContent: function(callback)
     {
         this._project.requestFileContent(this, callback);
     },
@@ skipping 647 matching lines @@
         function persist()
         {
             window.localStorage[key] = this._content;
             window.localStorage["revision-history"] = JSON.stringify(registry);
         }
 
         // Schedule async storage.
         setTimeout(persist.bind(this), 0);
     }
 }