Changeset 92907 in webkit

Timestamp:

Aug 11, 2011 8:14:32 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION: Qt JavaScript bridge signal connection fails
​https://bugs.webkit.org/show_bug.cgi?id=66097

Patch by Andrew Wason <​rectalogic@rectalogic.com> on 2011-08-11
Reviewed by Gavin Barraclough.

Source/WebCore:

Tests in WebKit/qt/tests/qwebframe

Call toThisObject() on exec->lexicalGlobalObject() so the correct
object is passed to the JS signal handler.

• bridge/qt/qt_runtime.cpp:

(JSC::Bindings::QtRuntimeConnectionMethod::call):

Source/WebKit/qt:

Unmark tests as expected failures, they pass now.

• tests/qwebframe/tst_qwebframe.cpp:

(tst_QWebFrame::connectAndDisconnect):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bridge/qt/qt_runtime.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/tests/qwebframe/tst_qwebframe.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-11  Andrew Wason  <rectalogic@rectalogic.com>
+
+        REGRESSION: Qt JavaScript bridge signal connection fails
+        https://bugs.webkit.org/show_bug.cgi?id=66097
+
+        Reviewed by Gavin Barraclough.
+
+        Tests in WebKit/qt/tests/qwebframe
+
+        Call toThisObject() on exec->lexicalGlobalObject() so the correct
+        object is passed to the JS signal handler.
+
+        * bridge/qt/qt_runtime.cpp:
+        (JSC::Bindings::QtRuntimeConnectionMethod::call):
+
 2011-08-11  Nico Weber  <thakis@chromium.org>
 

trunk/Source/WebCore/bridge/qt/qt_runtime.cpp

@@ -1585 +1585 @@
     if (sender) {
 
-        JSObject* thisObject = exec->lexicalGlobalObject();
+        JSObject* thisObject = exec->lexicalGlobalObject()->toThisObject(exec);
         JSObject* funcObject = 0;
 

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-08-11  Andrew Wason  <rectalogic@rectalogic.com>
+
+        REGRESSION: Qt JavaScript bridge signal connection fails
+        https://bugs.webkit.org/show_bug.cgi?id=66097
+
+        Reviewed by Gavin Barraclough.
+
+        Unmark tests as expected failures, they pass now.
+
+        * tests/qwebframe/tst_qwebframe.cpp:
+        (tst_QWebFrame::connectAndDisconnect):
+
 2011-08-09  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp

@@ -1455 +1455 @@
     QCOMPARE(evalJS("signalArgs.length == 0"), sTrue);
     QCOMPARE(evalJS("signalSender"),evalJS("myObject"));
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=65170", Continue);
     QCOMPARE(evalJS("slotThisObject == window"), sTrue);
 
@@ -1561 +1560 @@
     QCOMPARE(evalJS("myObject.mySignalWithIntArg.connect(myObject.mySlotWithIntArg)"), sUndefined);
     m_myObject->resetQtFunctionInvoked();
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=65170", Continue);
     QCOMPARE(evalJS("myObject.mySignalWithIntArg(123)"), sUndefined);
     QCOMPARE(m_myObject->qtFunctionInvoked(), 21);
@@ -1570 +1568 @@
     QCOMPARE(evalJS("myObject.mySignalWithIntArg.connect(myObject.mySlotWithDoubleArg)"), sUndefined);
     m_myObject->resetQtFunctionInvoked();
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=65170", Continue);
     QCOMPARE(evalJS("myObject.mySignalWithIntArg(123)"), sUndefined);
     QCOMPARE(m_myObject->qtFunctionInvoked(), 22);
@@ -1579 +1576 @@
     QCOMPARE(evalJS("myObject.mySignalWithIntArg.connect(myObject.mySlotWithStringArg)"), sUndefined);
     m_myObject->resetQtFunctionInvoked();
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=65170", Continue);
     QCOMPARE(evalJS("myObject.mySignalWithIntArg(123)"), sUndefined);
     QCOMPARE(m_myObject->qtFunctionInvoked(), 23);
@@ -1589 +1585 @@
     QCOMPARE(evalJS("myObject.mySignalWithIntArg.connect(myObject.myOverloadedSlot)"), sUndefined);
     m_myObject->resetQtFunctionInvoked();
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=65170", Continue);
     QCOMPARE(evalJS("myObject.mySignalWithIntArg(123)"), sUndefined);
     QCOMPARE(m_myObject->qtFunctionInvoked(), 26); // double overload
@@ -1598 +1593 @@
     QCOMPARE(evalJS("myObject.mySignalWithIntArg.connect(myObject['myOverloadedSlot(int)'])"), sUndefined);
     m_myObject->resetQtFunctionInvoked();
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=65170", Continue);
     QCOMPARE(evalJS("myObject.mySignalWithIntArg(456)"), sUndefined);
     QCOMPARE(m_myObject->qtFunctionInvoked(), 28); // int overload