Changeset 60886 in webkit

Timestamp:

Jun 9, 2010 1:57:35 AM (14 years ago)

Author:

yurys@chromium.org

Message:

2010-06-09 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: update stack trace after script source editing
​https://bugs.webkit.org/show_bug.cgi?id=40357

• src/js/DebuggerAgent.js: (devtools.DebuggerAgent.prototype.editScriptSource.this.requestSeqToCallback_.cmd.getSequenceNumber): (devtools.DebuggerAgent.prototype.editScriptSource.requestBacktrace): (devtools.DebuggerAgent.prototype.editScriptSource.handleBacktraceResponse): (devtools.DebuggerAgent.prototype.editScriptSource.reportDidCommitEditing): (devtools.DebuggerAgent.prototype.editScriptSource): (devtools.DebuggerAgent.prototype.requestBacktrace_): (devtools.DebuggerAgent.prototype.handleDebuggerOutput_): (devtools.DebuggerAgent.prototype.doHandleBacktraceResponse_): (devtools.DebuggerAgent.prototype.updateCallFramesFromBacktraceResponse_):
• src/js/InspectorControllerImpl.js: (.devtools.InspectorBackendImpl.prototype.editScriptSource):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/js/DebuggerAgent.js (modified) (6 diffs)
• src/js/InspectorControllerImpl.js (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-06-09  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: update stack trace after script source editing
+        https://bugs.webkit.org/show_bug.cgi?id=40357
+
+        * src/js/DebuggerAgent.js:
+        (devtools.DebuggerAgent.prototype.editScriptSource.this.requestSeqToCallback_.cmd.getSequenceNumber):
+        (devtools.DebuggerAgent.prototype.editScriptSource.requestBacktrace):
+        (devtools.DebuggerAgent.prototype.editScriptSource.handleBacktraceResponse):
+        (devtools.DebuggerAgent.prototype.editScriptSource.reportDidCommitEditing):
+        (devtools.DebuggerAgent.prototype.editScriptSource):
+        (devtools.DebuggerAgent.prototype.requestBacktrace_):
+        (devtools.DebuggerAgent.prototype.handleDebuggerOutput_):
+        (devtools.DebuggerAgent.prototype.doHandleBacktraceResponse_):
+        (devtools.DebuggerAgent.prototype.updateCallFramesFromBacktraceResponse_):
+        * src/js/InspectorControllerImpl.js:
+        (.devtools.InspectorBackendImpl.prototype.editScriptSource):
+
 2010-06-08  Tony Chang  <tony@chromium.org>
 

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

@@ -308 +308 @@
 
 /**
- * Changes given line of the script. 
+ * Changes given line of the script.
  */
 devtools.DebuggerAgent.prototype.editScriptSource = function(sourceId, newContent, callback)
@@ -320 +320 @@
     devtools.DebuggerAgent.sendCommand_(cmd);
     this.requestSeqToCallback_[cmd.getSequenceNumber()] = function(msg) {
-        if (!msg.isSuccess())
-            WebInspector.log("Unable to modify source code within given scope. Only function bodies are editable at the moment.", WebInspector.ConsoleMessage.MessageLevel.Warning);
-        this.resolveScriptSource(sourceId, callback);
+        if (!msg.isSuccess()) {
+            callback(false, "Unable to modify source code within given scope. Only function bodies are editable at the moment.", null);
+            return;
+        }
+
+        this.resolveScriptSource(sourceId, requestBacktrace.bind(this));
+    }.bind(this);
+
+
+    function requestBacktrace(newScriptSource) {
         if (WebInspector.panels.scripts.paused)
-            this.requestBacktrace_();
-    }.bind(this);
+            this.requestBacktrace_(handleBacktraceResponse.bind(this, newScriptSource));
+        else
+            reportDidCommitEditing(newScriptSource);
+    }
+
+    function handleBacktraceResponse(newScriptSource, msg) {
+        this.updateCallFramesFromBacktraceResponse_(msg);
+        reportDidCommitEditing(newScriptSource, this.callFrames_);
+    }
+
+    function reportDidCommitEditing(newScriptSource, callFrames) {
+        callback(true, newScriptSource, callFrames);
+    }
+
     RemoteDebuggerAgent.processDebugCommands();
 };
@@ -680 +699 @@
  * Sends "backtrace" request to v8.
  */
-devtools.DebuggerAgent.prototype.requestBacktrace_ = function()
+devtools.DebuggerAgent.prototype.requestBacktrace_ = function(opt_customHandler)
 {
     var cmd = new devtools.DebugCommand("backtrace", {
@@ -686 +705 @@
     });
     devtools.DebuggerAgent.sendCommand_(cmd);
+    var responseHandler = opt_customHandler ? opt_customHandler : this.handleBacktraceResponse_.bind(this);
+    this.requestSeqToCallback_[cmd.getSequenceNumber()] = responseHandler;
 };
 
@@ -801 +822 @@
             this.handleClearBreakpointResponse_(msg);
         else if (msg.getCommand() === "backtrace")
-            this.handleBacktraceResponse_(msg);
+            this.invokeCallbackForResponse_(msg);
         else if (msg.getCommand() === "lookup")
             this.invokeCallbackForResponse_(msg);
@@ -992 +1013 @@
 devtools.DebuggerAgent.prototype.doHandleBacktraceResponse_ = function(msg)
 {
+    this.updateCallFramesFromBacktraceResponse_(msg);
+    WebInspector.pausedScript(this.callFrames_);
+    this.showPendingExceptionMessage_();
+    InspectorFrontendHost.bringToFront();
+};
+
+
+devtools.DebuggerAgent.prototype.updateCallFramesFromBacktraceResponse_ = function(msg)
+{
     var frames = msg.getBody().frames;
     this.callFrames_ = [];
     for (var i = 0; i <  frames.length; ++i)
         this.callFrames_.push(this.formatCallFrame_(frames[i]));
-    WebInspector.pausedScript(this.callFrames_);
-    this.showPendingExceptionMessage_();
-    InspectorFrontendHost.bringToFront();
+    return this.callFrames_;
 };
 

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

@@ -145 +145 @@
 devtools.InspectorBackendImpl.prototype.editScriptSource = function(callID, sourceID, newContent)
 {
-    devtools.tools.getDebuggerAgent().editScriptSource(sourceID, newContent, function(newFullBody) {
-        WebInspector.didEditScriptSource(callID, newFullBody);
+    devtools.tools.getDebuggerAgent().editScriptSource(sourceID, newContent, function(success, newBodyOrErrorMessage, callFrames) {
+        WebInspector.didEditScriptSource(callID, success, newBodyOrErrorMessage, callFrames);
     });
 };