Changeset 147227 in webkit

Timestamp:

Mar 29, 2013 10:24:52 AM (11 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Content should not be lost when uiSourceCode's file was removed externally on file system.
​https://bugs.webkit.org/show_bug.cgi?id=113581

Reviewed by Pavel Feldman.

• inspector/front-end/IsolatedFileSystem.js:

(WebInspector.IsolatedFileSystem.prototype.errorHandler):
(WebInspector.IsolatedFileSystem.prototype.requestFileContent):
(WebInspector.IsolatedFileSystem.prototype.fileSystemLoaded):

• inspector/front-end/UISourceCode.js:

(WebInspector.UISourceCode.prototype.checkContentUpdated.contentLoaded):
(WebInspector.UISourceCode.prototype.checkContentUpdated):
(WebInspector.UISourceCode.prototype._commitContent):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-29  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Content should not be lost when uiSourceCode's file was removed externally on file system.
+        https://bugs.webkit.org/show_bug.cgi?id=113581
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/IsolatedFileSystem.js:
+        (WebInspector.IsolatedFileSystem.prototype.errorHandler):
+        (WebInspector.IsolatedFileSystem.prototype.requestFileContent):
+        (WebInspector.IsolatedFileSystem.prototype.fileSystemLoaded):
+        * inspector/front-end/UISourceCode.js:
+        (WebInspector.UISourceCode.prototype.checkContentUpdated.contentLoaded):
+        (WebInspector.UISourceCode.prototype.checkContentUpdated):
+        (WebInspector.UISourceCode.prototype._commitContent):
+
 2013-03-29  Vsevolod Vlasov  <vsevik@chromium.org>
 

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

@@ -179 +179 @@
         function errorHandler(error)
         {
+            if (error.code === FileError.NOT_FOUND_ERR) {
+                callback(null);
+                return;
+            }
+
             var errorMessage = WebInspector.IsolatedFileSystem.errorMessage(error);
             console.error(errorMessage + " when getting content for file '" + (this._path + "/" + path) + "'");
@@ -199 +204 @@
         function fileSystemLoaded(domFileSystem)
         {
-            domFileSystem.root.getFile(path, null, fileEntryLoaded, errorHandler);
+            domFileSystem.root.getFile(path, { create: true }, fileEntryLoaded, errorHandler);
         }
 

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

@@ -226 +226 @@
         function contentLoaded(updatedContent)
         {
+            if (updatedContent === null) {
+                var workingCopy = this.workingCopy();
+                this._commitContent("", false);
+                this.setWorkingCopy(workingCopy);
+                delete this._checkingContent;
+                return;
+            }
             if (typeof this._lastAcceptedContent === "string" && this._lastAcceptedContent === updatedContent) {
                 delete this._checkingContent;
@@ -231 +238 @@
             }
             if (this._content === updatedContent) {
+                delete this._lastAcceptedContent;
                 delete this._checkingContent;
                 return;
@@ -264 +272 @@
     _commitContent: function(content, shouldSetContentInProject)
     {
+        delete this._lastAcceptedContent;
         this._content = content;
         this._contentLoaded = true;