[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-34-g43a6bb2

[Gustavo Noronha Silva]

The following commit has been merged in the webkit-1.1 branch:
commit a35fc2a8992ef55d086883c0a8f4086c7ce5329e
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 21 21:34:03 2009 +0000

    2009-09-21  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Exception formatting is broken in console.
    
            https://bugs.webkit.org/show_bug.cgi?id=29608
    
            * inspector/front-end/ConsoleView.js:
            (WebInspector.ConsoleCommandResult):
            * inspector/front-end/InjectedScript.js:
            (InjectedScript.evaluate):
            (InjectedScript.createProxyObject):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48602 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 20817d8..8dbb019 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2182,6 +2182,20 @@
 
         Reviewed by Timothy Hatcher.
 
+        Web Inspector: Exception formatting is broken in console.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29608
+
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleCommandResult):
+        * inspector/front-end/InjectedScript.js:
+        (InjectedScript.evaluate):
+        (InjectedScript.createProxyObject):
+
+2009-09-21  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
         Web Inspector: Console object formatting is broken.
 
         https://bugs.webkit.org/show_bug.cgi?id=29607
diff --git a/WebCore/inspector/front-end/ConsoleView.js b/WebCore/inspector/front-end/ConsoleView.js
index 77257b4..abda4b5 100644
--- a/WebCore/inspector/front-end/ConsoleView.js
+++ b/WebCore/inspector/front-end/ConsoleView.js
@@ -911,7 +911,7 @@ WebInspector.ConsoleTextMessage.prototype.__proto__ = WebInspector.ConsoleMessag
 WebInspector.ConsoleCommandResult = function(result, exception, originatingCommand)
 {
     var level = (exception ? WebInspector.ConsoleMessage.MessageLevel.Error : WebInspector.ConsoleMessage.MessageLevel.Log);
-    var message = (exception ? String(result) : result);
+    var message = result;
     var line = (exception ? result.line : -1);
     var url = (exception ? result.sourceURL : null);
 
diff --git a/WebCore/inspector/front-end/InjectedScript.js b/WebCore/inspector/front-end/InjectedScript.js
index 2b6e419..ba38385 100644
--- a/WebCore/inspector/front-end/InjectedScript.js
+++ b/WebCore/inspector/front-end/InjectedScript.js
@@ -524,20 +524,20 @@ InjectedScript.evaluate = function(expression)
         if (value === null)
             return { value: null };
         if (Object.type(value) === "error") {
-            result.value = Object.describe(value);
+            result.value = InspectorController.wrapObject(value);
             result.isException = true;
             return result;
         }
 
         var wrapper = InspectorController.wrapObject(value);
-        if (typeof wrapper === "object" && wrapper.exception) {
-            result.value = wrapper.exception;
+        if (wrapper.errorText) {
+            result.value = InspectorController.wrapObject(wrapper.errorText);
             result.isException = true;
         } else {
             result.value = wrapper;
         }
     } catch (e) {
-        result.value = e.toString();
+        result.value = InspectorController.wrapObject(e.toString());
         result.isException = true;
     }
     return result;
@@ -976,7 +976,7 @@ InjectedScript.createProxyObject = function(object, objectId, abbreviate)
     try {
         result.description = Object.describe(object, abbreviate);
     } catch (e) {
-        result.exception = e.toString();
+        result.errorText = e.toString();
     }
     return result;
 }

-- 
WebKit Debian packaging