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

WebCore/inspector/front-end/CSSStyleModel.js

 /*
  * Copyright (C) 2010 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 146 matching lines @@
 
     _styleSheetChanged: function(styleSheetId, majorChange)
     {
         if (!majorChange || !styleSheetId)
             return;
 
         function callback(href, content)
         {
             var resource = WebInspector.resourceManager.resourceForURL(href);
             if (resource && resource.type === WebInspector.Resource.Type.Stylesheet)
-                resource.content = content;
+                resource.setContent(content, this._onRevert.bind(this, styleSheetId));
         }
-        InspectorBackend.getStyleSheetText2(styleSheetId, callback);
+        InspectorBackend.getStyleSheetText2(styleSheetId, callback.bind(this));
+    },
+
+    _onRevert: function(styleSheetId, contentToRevertTo)
+    {
+        function callback(success)
+        {
+            this._styleSheetChanged(styleSheetId, true);
+        }
+        InspectorBackend.setStyleSheetText2(styleSheetId, contentToRevertTo, callback.bind(this));
     }
 }
 
 WebInspector.CSSStyleDeclaration = function(payload)
 {
     this.id = payload.styleId;
     this.properties = payload.properties;
     this._shorthandValues = payload.shorthandValues;
     this._livePropertyMap = {}; // LIVE properties (source-based or style-based) : { name -> CSSProperty }
     this._allProperties = []; // ALL properties: [ CSSProperty ]
@@ skipping 361 matching lines @@
                 userCallback(null);
             else {
                 userCallback(new WebInspector.CSSStyleSheet(styleSheetPayload));
                 WebInspector.cssModel._styleSheetChanged(this.id, true);
             }
         }
 
         InspectorBackend.setStyleSheetText2(this.id, newText, callback.bind(this));
     }
 }