Merge 129648 - Web Inspector: [REGRESSION] Revision support problems: revert and apply original con…

Source/WebCore/inspector/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 186 matching lines @@
         var historyItems = registry[this.url];
         for (var i = 0; historyItems && i < historyItems.length; ++i)
             delete window.localStorage[historyItems[i].key];
         delete registry[this.url];
         window.localStorage["revision-history"] = JSON.stringify(registry);
     },
    
     revertToOriginal: function()
     {
         /**
+         * @this {WebInspector.UISourceCode}
          * @param {?string} content
          * @param {boolean} contentEncoded
          * @param {string} mimeType
          */
-      function callback(content, contentEncoded, mimeType)
+        function callback(content, contentEncoded, mimeType)
         {
-            this._setContent();
+            if (typeof content === "undefined")
+                return;
+
+            this._setContent(/** @type {string} */ content);
         }
 
         this.requestOriginalContent(callback.bind(this));
     },
 
+    /**
+     * @param {function(WebInspector.UISourceCode)} callback
+     */
     revertAndClearHistory: function(callback)
     {
-        function revert(content)
+        /**
+         * @this {WebInspector.UISourceCode}
+         * @param {?string} content
+         * @param {boolean} contentEncoded
+         * @param {string} mimeType
+         */
+        function revert(content, contentEncoded, mimeType)
         {
-            this._setContent(content);
+            if (typeof content === "undefined")
+                return;
+
+            this._setContent(/** @type {string} */ content);
             this._clearRevisionHistory();
             this.history = [];
-            callback();
+            callback(this);
         }
 
         this.requestOriginalContent(revert.bind(this));
     },
 
     /**
      * @param {string} newContent
      * @param {string} mimeType
      */
     contentChanged: function(newContent, mimeType)
@@ skipping 594 matching lines @@
         function persist()
         {
             window.localStorage[key] = this._content;
             window.localStorage["revision-history"] = JSON.stringify(registry);
         }
 
         // Schedule async storage.
         setTimeout(persist.bind(this), 0);
     }
 }