2010-07-24 Andreas Kling <andreas.kling@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
parent 6403f7ea
2010-07-24 Andreas Kling <andreas.kling@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@webkit.org>
Reviewed by Eric Seidel.
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment