[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 304c979d6db441ebb50e3203fe32b41acdaed6ed
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jul 25 15:46:53 2010 +0000

    2010-07-25  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: check of jQuery object type prior to treating it as an array.
    
            https://bugs.webkit.org/show_bug.cgi?id=42946
    
            * inspector/front-end/InjectedScript.js:
            (injectedScriptConstructor):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64021 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f275453..175320f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-25  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: check of jQuery object type prior to treating it as an array.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42946
+
+        * inspector/front-end/InjectedScript.js:
+        (injectedScriptConstructor):
+
 2010-07-24  Daniel Bates  <dbates at rim.com>
 
         Unreviewed, build fix when building with WML support.
diff --git a/WebCore/inspector/front-end/InjectedScript.js b/WebCore/inspector/front-end/InjectedScript.js
index f9e4385..fdeea1f 100644
--- a/WebCore/inspector/front-end/InjectedScript.js
+++ b/WebCore/inspector/front-end/InjectedScript.js
@@ -545,7 +545,7 @@ InjectedScript._type = function(obj)
         return "array";
     if (obj instanceof inspectedWindow.HTMLCollection)
         return "array";
-    if (inspectedWindow.jQuery && obj instanceof inspectedWindow.jQuery)
+    if (typeof inspectedWindow.jQuery === "function" && obj instanceof inspectedWindow.jQuery)
         return "array";
     if (obj instanceof inspectedWindow.Error)
         return "error";

-- 
WebKit Debian packaging