Merge 72938 - 2010-11-30 Pavel Feldman <pfeldman@chromium.org>...

WebCore/inspector/front-end/Resource.js

 /*
  * Copyright (C) 2007, 2008 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 607 matching lines @@
 
         if (msg)
             WebInspector.console.addMessage(msg);
     },
 
     get content()
     {
         return this._content;
     },
 
-    set content(content)
-    {
-        var data = { oldContent: this._content, oldContentTimestamp: this._contentTimestamp };
-        this._content = content;
-        this._contentTimestamp = new Date();
-        this.dispatchEventToListeners("content-changed", data);
-    },
-
     get contentTimestamp()
     {
         return this._contentTimestamp;
     },
 
     setInitialContent: function(content)
     {
         this._content = content;
     },
 
+    isLocallyModified: function()
+    {
+        return !!this._baseRevision;
+    },
+
+    setContent: function(newContent, onRevert)
+    {
+        var revisionResource = new WebInspector.Resource(null, this.url);
+        revisionResource.type = this.type;
+        revisionResource.loader = this.loader;
+        revisionResource.timestamp = this.timestamp;
+        revisionResource._content = this._content;
+        revisionResource._actualResource = this;
+        revisionResource._fireOnRevert = onRevert;
+
+        if (this.finished)
+            revisionResource.finished = true;
+        else {
+            function finished()
+            {
+                this.removeEventListener("finished", finished);
+                revisionResource.finished = true;
+            }
+            this.addEventListener("finished", finished.bind(this));
+        }
+
+        if (!this._baseRevision)
+            this._baseRevision = revisionResource;
+        else
+            revisionResource._baseRevision = this._baseRevision;
+
+        var data = { revision: revisionResource };
+        this._content = newContent;
+        this.timestamp = new Date();
+        this.dispatchEventToListeners("content-changed", data);
+    },
+
+    revertToThis: function()
+    {
+        if (!this._actualResource || !this._fireOnRevert)
+            return;
+
+        function callback(content)
+        {
+            if (content)
+                this._fireOnRevert(content);
+        }
+        this.requestContent(callback.bind(this));
+    },
+
+    get baseRevision()
+    {
+        return this._baseRevision;
+    },
+
     requestContent: function(callback)
     {
         if (this._content) {
             callback(this._content, this._contentEncoded);
             return;
         }
         this._pendingContentCallbacks.push(callback);
         if (this.finished)
             this._innerRequestContent();
     },
@@ skipping 22 matching lines @@
             for (var i = 0; i < callbacks.length; ++i)
                 callbacks[i](this._content, this._contentEncoded);
             this._pendingContentCallbacks.length = 0;
             delete this._contentRequested;
         }
         WebInspector.ResourceManager.requestContent(this, this._contentEncoded, onResourceContent.bind(this));
     }
 }
 
 WebInspector.Resource.prototype.__proto__ = WebInspector.Object.prototype;