[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 01acdf64dd9c52e98604c642ce8e0a38ebc01ad7
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 26 11:21:47 2010 +0000

    2010-07-26  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Shinichiro Hamaji.
    
            Web Inspector: make sure proxy objects are JSON-stringifiable.
    
            https://bugs.webkit.org/show_bug.cgi?id=42961
    
            * inspector/front-end/InjectedScript.js:
            (injectedScriptConstructor):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64040 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8cd5f56..4196839 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-26  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Web Inspector: make sure proxy objects are JSON-stringifiable.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42961
+
+        * inspector/front-end/InjectedScript.js:
+        (injectedScriptConstructor):
+
 2010-07-26  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Joseph Pecoraro.
diff --git a/WebCore/inspector/front-end/InjectedScript.js b/WebCore/inspector/front-end/InjectedScript.js
index fdeea1f..ce187d2 100644
--- a/WebCore/inspector/front-end/InjectedScript.js
+++ b/WebCore/inspector/front-end/InjectedScript.js
@@ -388,7 +388,7 @@ InjectedScript.createProxyObject = function(object, objectId, abbreviate)
 
     var type = typeof object;
     
-    result.hasChildren = (type === "object" && object !== null && (Object.getOwnPropertyNames(object).length || object.__proto__)) || type === "function";
+    result.hasChildren = (type === "object" && object !== null && (Object.getOwnPropertyNames(object).length || !!object.__proto__)) || type === "function";
     try {
         result.description = InjectedScript._describe(object, abbreviate);
     } catch (e) {

-- 
WebKit Debian packaging