Changeset 85042 in webkit

Timestamp:

Apr 27, 2011 3:00:47 AM (13 years ago)

Author:

yurys@chromium.org

Message:

2011-04-27 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: expose exception details when script is paused on exception
​https://bugs.webkit.org/show_bug.cgi?id=59591

When script is paused on an exception, the exception value is added as <exception>
property in the local scope and the breakpoint details message says
"Paused on excepion: '<exception to strin value>'."

• English.lproj/localizedStrings.js:
• inspector/front-end/ScopeChainSidebarPane.js: (WebInspector.ScopeChainSidebarPane.prototype.update):
• inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype._debuggerPaused.else.didGetSourceLocation): (WebInspector.ScriptsPanel.prototype._debuggerPaused):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (previous)
• inspector/front-end/ScopeChainSidebarPane.js (modified) (2 diffs)
• inspector/front-end/ScriptsPanel.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-27  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: expose exception details when script is paused on exception
+        https://bugs.webkit.org/show_bug.cgi?id=59591
+
+        When script is paused on an exception, the exception value is added as <exception>
+        property in the local scope and the breakpoint details message says
+        "Paused on excepion: '<exception to strin value>'."
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/ScopeChainSidebarPane.js:
+        (WebInspector.ScopeChainSidebarPane.prototype.update):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._debuggerPaused.else.didGetSourceLocation):
+        (WebInspector.ScriptsPanel.prototype._debuggerPaused):
+
 2011-04-26  Yury Semikhatsky  <yurys@chromium.org>
 

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

@@ -1 +1 @@
 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -74 +75 @@
                     if (scope.this)
                         extraProperties = [ new WebInspector.RemoteObjectProperty("this", WebInspector.RemoteObject.fromPayload(scope.this)) ];
+                    if (i == 0) {
+                        var exception = WebInspector.debuggerModel.debuggerPausedDetails.exception;
+                        if (exception) {
+                            extraProperties = extraProperties || [];
+                            extraProperties.push(new WebInspector.RemoteObjectProperty("<exception>", WebInspector.RemoteObject.fromPayload(exception)));
+                        }
+                    }
                     break;
                 case "closure":

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

@@ -1 +1 @@
 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -413 +414 @@
             function didGetSourceLocation(sourceFileId, lineNumber)
             {
+                var exception = WebInspector.debuggerModel.debuggerPausedDetails.exception;
+                if (exception) {
+                    this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on exception: '%s'.", exception.description));
+                    return;
+                }
+
                 if (!sourceFileId || !this._presentationModel.findBreakpoint(sourceFileId, lineNumber))
                     return;