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

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2b12ea37429b44aaff656955334d30d2d490e03f
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 18 23:17:37 2009 +0000

    2009-10-18  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Title of dir(["test", "test2"]) should be Array
    
            https://bugs.webkit.org/show_bug.cgi?id=30486
    
            Test: inspector/console-tests.html
    
            * inspector/front-end/InjectedScript.js:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49758 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/inspector/console-tests-expected.txt b/LayoutTests/inspector/console-tests-expected.txt
index 94141b5..8e971b3 100644
--- a/LayoutTests/inspector/console-tests-expected.txt
+++ b/LayoutTests/inspector/console-tests-expected.txt
@@ -13,6 +13,8 @@ CONSOLE MESSAGE: line 17: repeated
 CONSOLE MESSAGE: line 17: repeated
 CONSOLE MESSAGE: line 22: 1
 CONSOLE MESSAGE: line 23: [object HTMLDocument]
+CONSOLE MESSAGE: line 24: test1,test2
+CONSOLE MESSAGE: line 25: [object NodeList]
 Tests that console logging dumps proper messages.
 
 console-tests.html:8log console-message console-js-source console-log-level
@@ -30,4 +32,6 @@ console-tests.html:20group console-message console-js-source console-log-level c
 console-message console-js-source console-log-level
 console-tests.html:221 2 3 console-message console-js-source console-log-level
 console-tests.html:23HTMLDocument console-message console-js-source console-log-level
+console-tests.html:24Array console-message console-js-source console-log-level
+console-tests.html:25NodeList console-message console-js-source console-log-level
 
diff --git a/LayoutTests/inspector/console-tests.html b/LayoutTests/inspector/console-tests.html
index e99e0e4..2a63d0a 100755
--- a/LayoutTests/inspector/console-tests.html
+++ b/LayoutTests/inspector/console-tests.html
@@ -21,6 +21,8 @@ function doit()
     console.groupEnd();
     console.log('1', '2', '3');
     console.dir(document);
+    console.dir(["test1", "test2"]);
+    console.dir(document.childNodes);
 
     function callback(result)
     {
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d1fae52..9888b52 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-18  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Title of dir(["test", "test2"]) should be Array
+
+        https://bugs.webkit.org/show_bug.cgi?id=30486
+
+        Test: inspector/console-tests.html
+
+        * inspector/front-end/InjectedScript.js:
+
 2009-10-18  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/inspector/front-end/InjectedScript.js b/WebCore/inspector/front-end/InjectedScript.js
index 5d3c042..3ce96d0 100644
--- a/WebCore/inspector/front-end/InjectedScript.js
+++ b/WebCore/inspector/front-end/InjectedScript.js
@@ -1142,9 +1142,8 @@ Object.describe = function(obj, abbreviated)
     switch (type1) {
     case "object":
     case "node":
-        return type2;
     case "array":
-        return "[" + obj.toString() + "]";
+        return type2;
     case "string":
         if (!abbreviated)
             return obj;

-- 
WebKit Debian packaging