Changeset 58477 in webkit

Timestamp:

Apr 28, 2010 11:10:03 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-28 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: Allow editing script resources when resource tracking is enabled.

​https://bugs.webkit.org/show_bug.cgi?id=38269

• inspector/front-end/ScriptView.js:
• inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype.canEditScripts): (WebInspector.ScriptsPanel.prototype.editScriptSource):
• inspector/front-end/SourceFrame.js: (WebInspector.SourceFrame.prototype.get textModel):
• inspector/front-end/SourceView.js: (WebInspector.SourceView): (WebInspector.SourceView.prototype._addBreakpoint): (WebInspector.SourceView.prototype._editLine): (WebInspector.SourceView.prototype._editLineComplete): (WebInspector.SourceView.prototype._sourceIDForLine):

2010-04-28 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: Allow editing script resources when resource tracking is enabled.

​http://bugs.webkit.org/show_bug.cgi?id=38269

• src/js/DebuggerAgent.js:
• src/js/InspectorControllerImpl.js: (.devtools.InspectorBackendImpl.prototype.setBreakpoint): (.devtools.InspectorBackendImpl.prototype.editScriptSource):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/front-end/ScriptView.js (modified) (2 diffs)
• WebCore/inspector/front-end/ScriptsPanel.js (modified) (4 diffs)
• WebCore/inspector/front-end/SourceFrame.js (modified) (1 diff)
• WebCore/inspector/front-end/SourceView.js (modified) (3 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/js/DebuggerAgent.js (modified) (1 diff)
• WebKit/chromium/src/js/InspectorControllerImpl.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-28  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Allow editing script resources when resource tracking is enabled.
+
+        https://bugs.webkit.org/show_bug.cgi?id=38269
+
+        * inspector/front-end/ScriptView.js:
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype.canEditScripts):
+        (WebInspector.ScriptsPanel.prototype.editScriptSource):
+        * inspector/front-end/SourceFrame.js:
+        (WebInspector.SourceFrame.prototype.get textModel):
+        * inspector/front-end/SourceView.js:
+        (WebInspector.SourceView):
+        (WebInspector.SourceView.prototype._addBreakpoint):
+        (WebInspector.SourceView.prototype._editLine):
+        (WebInspector.SourceView.prototype._editLineComplete):
+        (WebInspector.SourceView.prototype._sourceIDForLine):
+
 2010-04-25  Antonio Gomes  <tonikitoo@webkit.org>
 

trunk/WebCore/inspector/front-end/ScriptView.js

@@ -78 +78 @@
     },
 
-    _editLine: function(line, newContent)
-    {
-        WebInspector.panels.scripts.editScriptLine(this.script.sourceID, line, newContent, this._editLineComplete.bind(this));
-    },
-
     _editLineComplete: function(newBody)
     {
@@ -108 +103 @@
     _sourceFrameSetupFinished: WebInspector.SourceView.prototype._sourceFrameSetupFinished,
     _removeBreakpoint: WebInspector.SourceView.prototype._removeBreakpoint,
+    _editLine: WebInspector.SourceView.prototype._editLine,
     resize: WebInspector.SourceView.prototype.resize
 }

trunk/WebCore/inspector/front-end/ScriptsPanel.js

@@ -360 +360 @@
     canEditScripts: function()
     {
-        return !!InspectorBackend.editScriptLine;
-    },
-
-    editScriptLine: function(sourceID, line, newContent, callback)
+        return !!InspectorBackend.editScriptSource;
+    },
+
+    editScriptSource: function(sourceID, newContent, line, linesCountToShift, callback)
     {
         if (!this.canEditScripts())
@@ -377 +377 @@
         }
 
-        var linesCountToShift = newContent.split("\n").length - 1;
         function mycallback(newBody)
         {
@@ -389 +388 @@
         };
         var callbackId = WebInspector.Callback.wrap(mycallback.bind(this))
-        InspectorBackend.editScriptLine(callbackId, sourceID, line, newContent);
+        InspectorBackend.editScriptSource(callbackId, sourceID, newContent);
     },
 
@@ -1005 +1004 @@
 WebInspector.ScriptsPanel.prototype.__proto__ = WebInspector.Panel.prototype;
 
-WebInspector.didEditScriptLine = WebInspector.Callback.processCallback;
+WebInspector.didEditScriptSource = WebInspector.Callback.processCallback;

trunk/WebCore/inspector/front-end/SourceFrame.js

@@ -153 +153 @@
     },
 
+    get textModel()
+    {
+        return this._textModel;
+    },
+
     highlightLine: function(line)
     {

trunk/WebCore/inspector/front-end/SourceView.js

@@ -33 +33 @@
     this.element.addStyleClass("source");
 
-    this.sourceFrame = new WebInspector.SourceFrame(this.contentElement, this._addBreakpoint.bind(this), this._removeBreakpoint.bind(this));
+    var canEditScripts = WebInspector.panels.scripts.canEditScripts() && resource.type === WebInspector.Resource.Type.Script;
+    this.sourceFrame = new WebInspector.SourceFrame(this.contentElement, this._addBreakpoint.bind(this), this._removeBreakpoint.bind(this), canEditScripts ? this._editLine.bind(this) : null);
     resource.addEventListener("finished", this._resourceLoadingFinished, this);
     this._frameNeedsSetup = true;
@@ -105 +106 @@
 
     _addBreakpoint: function(line)
+    {
+        var sourceID = this._sourceIDForLine(line);
+        if (WebInspector.panels.scripts) {
+            var breakpoint = new WebInspector.Breakpoint(this.resource.url, line, sourceID);
+            WebInspector.panels.scripts.addBreakpoint(breakpoint);
+        }
+    },
+
+    _removeBreakpoint: function(breakpoint)
+    {
+        if (WebInspector.panels.scripts)
+            WebInspector.panels.scripts.removeBreakpoint(breakpoint);
+    },
+
+    _editLine: function(line, newContent)
+    {
+        var lines = [];
+        var textModel = this.sourceFrame.textModel;
+        for (var i = 0; i < textModel.linesCount; ++i) {
+            if (i === line)
+                lines.push(newContent);
+            else
+                lines.push(textModel.line(i));
+        }
+
+        var linesCountToShift = newContent.split("\n").length - 1;
+        WebInspector.panels.scripts.editScriptSource(this._sourceIDForLine(line), lines.join("\n"), line, linesCountToShift, this._editLineComplete.bind(this));
+    },
+
+    _editLineComplete: function(newBody)
+    {
+        this.sourceFrame.updateContent(newBody);
+    },
+
+    _sourceIDForLine: function(line)
     {
         var sourceID = null;
@@ -116 +152 @@
             }
         }
-
-        if (WebInspector.panels.scripts) {
-            var breakpoint = new WebInspector.Breakpoint(this.resource.url, line, sourceID);
-            WebInspector.panels.scripts.addBreakpoint(breakpoint);
-        }
-    },
-
-    _removeBreakpoint: function(breakpoint)
-    {
-        if (WebInspector.panels.scripts)
-            WebInspector.panels.scripts.removeBreakpoint(breakpoint);
+        return sourceID;
     },
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-04-28  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Allow editing script resources when resource tracking is enabled.
+
+        http://bugs.webkit.org/show_bug.cgi?id=38269
+ 
+        * src/js/DebuggerAgent.js:
+        * src/js/InspectorControllerImpl.js:
+        (.devtools.InspectorBackendImpl.prototype.setBreakpoint):
+        (.devtools.InspectorBackendImpl.prototype.editScriptSource):
+
 2010-04-28  Darin Fisher  <darin@chromium.org>
 

trunk/WebKit/chromium/src/js/DebuggerAgent.js

@@ -310 +310 @@
  * Changes given line of the script. 
  */
-devtools.DebuggerAgent.prototype.editScriptLine = function(sourceId, line, newContent, callback)
-{
-    var script = this.parsedScripts_[sourceId];
-    if (!script || !script.source)
-        return;
-
-    var lines = script.source.split("\n");
-    lines[line] = newContent;
-
+devtools.DebuggerAgent.prototype.editScriptSource = function(sourceId, newContent, callback)
+{
     var commandArguments = {
         "script_id": sourceId,
-        "new_source": lines.join("\n")
+        "new_source": newContent
     };
 

trunk/WebKit/chromium/src/js/InspectorControllerImpl.js

@@ -139 +139 @@
 
 
-devtools.InspectorBackendImpl.prototype.editScriptLine = function(callID, sourceID, line, newContent)
-{
-    devtools.tools.getDebuggerAgent().editScriptLine(sourceID, line, newContent, function(newFullBody) {
-        WebInspector.didEditScriptLine(callID, newFullBody);
+devtools.InspectorBackendImpl.prototype.editScriptSource = function(callID, sourceID, newContent)
+{
+    devtools.tools.getDebuggerAgent().editScriptSource(sourceID, newContent, function(newFullBody) {
+        WebInspector.didEditScriptSource(callID, newFullBody);
     });
 };