Changeset 83719 in webkit

Timestamp:

Apr 13, 2011 4:37:10 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-04-13 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: inactive style sheets should be read only.
​https://bugs.webkit.org/show_bug.cgi?id=58423

• inspector/front-end/ResourceView.js: (WebInspector.CSSSourceFrame): (WebInspector.CSSSourceFrame.prototype.isContentEditable): (WebInspector.CSSSourceFrame.prototype._loadStyleSheet.didGetAllStyleSheets.didCreateForId): (WebInspector.CSSSourceFrame.prototype._loadStyleSheet):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/DebuggerPresentationModel.js (modified) (1 diff)
• inspector/front-end/ResourceView.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-13  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: inactive style sheets should be read only.
+        https://bugs.webkit.org/show_bug.cgi?id=58423
+
+        * inspector/front-end/ResourceView.js:
+        (WebInspector.CSSSourceFrame):
+        (WebInspector.CSSSourceFrame.prototype.isContentEditable):
+        (WebInspector.CSSSourceFrame.prototype._loadStyleSheet.didGetAllStyleSheets.didCreateForId):
+        (WebInspector.CSSSourceFrame.prototype._loadStyleSheet):
+
 2011-04-13  Mikhail Naganov  <mnaganov@chromium.org>
 

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

@@ -131 +131 @@
     canEditScriptSource: function(sourceFileId)
     {
-        if (!Preferences.canEditScriptSource)
+        if (!Preferences.canEditScriptSource || this._formatSourceFiles)
             return false;
         var script = this._scriptForSourceFileId(sourceFileId);

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

@@ -161 +161 @@
 {
     WebInspector.ResourceSourceFrame.call(this, resource);
+    this._loadStyleSheet();
 }
 
@@ -166 +167 @@
     isContentEditable: function()
     {
-        return true;
-    },
-
-    _editContent: function(newText, callback)
-    {
-        function handleStyleSheet(newText, styleSheet)
+        return !!this._styleSheet;
+    },
+
+    _loadStyleSheet: function()
+    {
+        function didGetAllStyleSheets(error, infos)
         {
-            this._styleSheet = styleSheet;
-            this._saveStyleSheet(newText, callback);
-        }
-
-        function handleInfos(newText, error, infos)
-        {
-            if (error) {
-                callback(error);
+            if (error)
                 return;
-            }
-
+
+            var stylesheetId;
             for (var i = 0; i < infos.length; ++i) {
                 var info = infos[i];
                 if (info.sourceURL === this._resource.url) {
-                    WebInspector.CSSStyleSheet.createForId(info.styleSheetId, handleStyleSheet.bind(this, newText));
+                    stylesheetId = info.styleSheetId;
                     break;
                 }
             }
-        }
-
-        if (this._styleSheet)
-            this._saveStyleSheet(newText, callback);
-        else
-            CSSAgent.getAllStyleSheets(handleInfos.bind(this, newText));
-    },
-
-    _saveStyleSheet: function(newText, callback)
-    {
+            if (!stylesheetId)
+                return;
+
+            function didCreateForId(styleSheet)
+            {
+                this._styleSheet = styleSheet;
+            }
+            WebInspector.CSSStyleSheet.createForId(stylesheetId, didCreateForId.bind(this));
+        }
+        CSSAgent.getAllStyleSheets(didGetAllStyleSheets.bind(this));
+    },
+
+    _editContent: function(newText, callback)
+    {
+        if (!this._styleSheet) {
+            callback("Stylesheet not found.");
+            return;
+        }
+
         function didSetText(success)
         {