Changeset 122482 in webkit

Timestamp:

Jul 12, 2012 10:59:02 AM (12 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Simplify UISourceCode code after moving revisions support inside it.
​https://bugs.webkit.org/show_bug.cgi?id=91118

Reviewed by Pavel Feldman.

• inspector/front-end/UISourceCode.js:

(WebInspector.UISourceCode.prototype._setContent):
(WebInspector.UISourceCode.prototype.revertToOriginal):
(WebInspector.UISourceCode.prototype.revertAndClearHistory):
(WebInspector.UISourceCode.prototype.contentChanged):
(WebInspector.UISourceCode.prototype.commitWorkingCopy):
(WebInspector.Revision.prototype.revertToThis):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/UISourceCode.js (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-12  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Simplify UISourceCode code after moving revisions support inside it.
+        https://bugs.webkit.org/show_bug.cgi?id=91118
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/UISourceCode.js:
+        (WebInspector.UISourceCode.prototype._setContent):
+        (WebInspector.UISourceCode.prototype.revertToOriginal):
+        (WebInspector.UISourceCode.prototype.revertAndClearHistory):
+        (WebInspector.UISourceCode.prototype.contentChanged):
+        (WebInspector.UISourceCode.prototype.commitWorkingCopy):
+        (WebInspector.Revision.prototype.revertToThis):
+
 2012-07-12  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 

trunk/Source/WebCore/inspector/front-end/UISourceCode.js

@@ -150 +150 @@
     /**
      * @param {string} newContent
-     * @param {function(?string)} callback
-     */
-    _setContent: function(newContent, callback)
-    {
-        if (!this.isEditable())
-            return;
+     */
+    _setContent: function(newContent)
+    {
         this.setWorkingCopy(newContent);
-        this.commitWorkingCopy(callback);
+        this.commitWorkingCopy(function() {});
     },
 
@@ -207 +204 @@
     revertToOriginal: function()
     {
+        /**
+         * @param {?string} content
+         * @param {boolean} contentEncoded
+         * @param {string} mimeType
+         */
+      function callback(content, contentEncoded, mimeType)
+        {
+            this._setContent();
+        }
+
+        this.requestOriginalContent(callback.bind(this));
+    },
+
+    revertAndClearHistory: function(callback)
+    {
         function revert(content)
         {
-            this._setContent(content, function() {});
-        }
-        this.requestOriginalContent(revert.bind(this));
-    },
-
-    revertAndClearHistory: function(callback)
-    {
-        function revert(content)
-        {
-            this._setContent(content, clearHistory.bind(this));
-        }
-
-        function clearHistory()
-        {
+            this._setContent(content);
             this._clearRevisionHistory();
             this.history = [];
@@ -237 +236 @@
     contentChanged: function(newContent, mimeType)
     {
-        if (this._committingWorkingCopy)
-            return;
-
         this._content = newContent;
         this._mimeType = mimeType;
@@ -295 +291 @@
 
         var newContent = this._workingCopy;
-        this._committingWorkingCopy = true;
         this.workingCopyCommitted(callback);
         this.addRevision(newContent);
-        delete this._committingWorkingCopy;
-        this.contentChanged(newContent, this._mimeType);
-
     },
 
@@ -620 +612 @@
         {
             if (this._uiSourceCode._content !== content)
-                this._uiSourceCode._setContent(content, function() {});
+                this._uiSourceCode._setContent(content);
         }
         this.requestContent(revert.bind(this));