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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 04132cb247a8f551c26b35a51ca4a0170dfa5f41
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jul 24 18:48:42 2010 +0000

    2010-07-24  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] tst_QWebFrame::callQtInvokable() fails
            https://bugs.webkit.org/show_bug.cgi?id=41065
    
            Converting JS objects to QVariantMaps was broken.
            This is a partial revert of <http://trac.webkit.org/changeset/61478>
    
            * bridge/qt/qt_runtime.cpp:
            (JSC::Bindings::convertValueToQVariant): Remove erroneous crash guard
            around JSObject::getPropertyNames()
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e3dfb70..4a1ba57 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-24  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] tst_QWebFrame::callQtInvokable() fails
+        https://bugs.webkit.org/show_bug.cgi?id=41065
+
+        Converting JS objects to QVariantMaps was broken.
+        This is a partial revert of <http://trac.webkit.org/changeset/61478>
+
+        * bridge/qt/qt_runtime.cpp:
+        (JSC::Bindings::convertValueToQVariant): Remove erroneous crash guard
+        around JSObject::getPropertyNames()
+
 2010-07-24  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/bridge/qt/qt_runtime.cpp b/WebCore/bridge/qt/qt_runtime.cpp
index cfab3a2..b9cf4b0 100644
--- a/WebCore/bridge/qt/qt_runtime.cpp
+++ b/WebCore/bridge/qt/qt_runtime.cpp
@@ -338,8 +338,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type
             if (type == Object || type == Array || type == RTArray) {
                 // Enumerate the contents of the object
                 PropertyNameArray properties(exec);
-                if (properties.size() > 0)
-                    object->getPropertyNames(exec, properties);
+                object->getPropertyNames(exec, properties);
                 PropertyNameArray::const_iterator it = properties.begin();
 
                 QVariantMap result;

-- 
WebKit Debian packaging