[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[podivilov at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 8e0c8f10d113c09cbac4d8c08905757db04f0175
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 13:54:59 2011 +0000

    2011-01-18  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: [REGRESSION] JavaScript exceptions aren't shown in source frame.
            https://bugs.webkit.org/show_bug.cgi?id=52623
    
            * inspector/front-end/ConsoleView.js:
            (WebInspector.ConsoleMessage):
            (WebInspector.ConsoleMessage.prototype._formatMessage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76019 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 0e706bb..26cb5d1 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-18  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: [REGRESSION] JavaScript exceptions aren't shown in source frame.
+        https://bugs.webkit.org/show_bug.cgi?id=52623
+
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleMessage):
+        (WebInspector.ConsoleMessage.prototype._formatMessage):
+
 2011-01-18  Pavel Feldman  <pfeldman at chromium.org>
 
         Revert r76017. No need to guard InspectorInstrumentation:: in WebCore.
diff --git a/Source/WebCore/inspector/front-end/ConsoleView.js b/Source/WebCore/inspector/front-end/ConsoleView.js
index a40030e..5adfcac 100644
--- a/Source/WebCore/inspector/front-end/ConsoleView.js
+++ b/Source/WebCore/inspector/front-end/ConsoleView.js
@@ -681,6 +681,15 @@ WebInspector.ConsoleMessage = function(source, type, level, line, url, repeatCou
     this._parameters = parameters;
     this._stackTrace = stackTrace;
     this._requestId = requestId;
+
+    if (stackTrace && stackTrace.length) {
+        var topCallFrame = stackTrace[0];
+        if (!this.url)
+            this.url = topCallFrame.scriptName;
+        if (!this.line)
+            this.line = topCallFrame.lineNumber;
+    }
+
     this._formatMessage();
 }
 
@@ -737,17 +746,8 @@ WebInspector.ConsoleMessage.prototype = {
         this._formattedMessage = document.createElement("span");
         this._formattedMessage.className = "console-message-text source-code";
 
-        if (stackTrace && stackTrace.length) {
-            var topCallFrame = stackTrace[0];
-            var sourceName = topCallFrame.scriptName;
-            var sourceLine = topCallFrame.lineNumber;
-        } else {
-            var sourceName = this.url;
-            var sourceLine = this.line;
-        }
-
-        if (sourceName && sourceName !== "undefined") {
-            var urlElement = WebInspector.linkifyResourceAsNode(sourceName, "scripts", sourceLine, "console-message-url");
+        if (this.url && this.url !== "undefined") {
+            var urlElement = WebInspector.linkifyResourceAsNode(this.url, "scripts", this.line, "console-message-url");
             this._formattedMessage.appendChild(urlElement);
         }
 

-- 
WebKit Debian packaging