Changeset 70690 in webkit

Timestamp:

Oct 27, 2010 12:39:42 PM (14 years ago)

Author:

jocelyn.turcotte@nokia.com

Message:

2010-10-27 Jocelyn Turcotte <​jocelyn.turcotte@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Fix tst_QWebFrame::popupFocus().
​https://bugs.webkit.org/show_bug.cgi?id=48432

• Call setFocus() before show() to work around a but in Qt.
• Remove the check on combo at the end since hidePopup() leads indirectly to its destruction and segfault.

• tests/qwebframe/tst_qwebframe.cpp:

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• tests/qwebframe/tst_qwebframe.cpp (modified) (2 diffs)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-10-27  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix tst_QWebFrame::popupFocus().
+        https://bugs.webkit.org/show_bug.cgi?id=48432
+
+        - Call setFocus() before show() to work around a but in Qt.
+        - Remove the check on combo at the end since hidePopup() leads
+          indirectly to its destruction and segfault.
+
+        * tests/qwebframe/tst_qwebframe.cpp:
+
 2010-10-26  Jenn Braithwaite  <jennb@chromium.org>
 

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

@@ -2604 +2604 @@
                  "</html>");
     view.resize(400, 100);
+    // Call setFocus before show to work around http://bugreports.qt.nokia.com/browse/QTBUG-14762
+    view.setFocus();
     view.show();
     QTest::qWaitForWindowShown(&view);
-    view.setFocus();
     QTRY_VERIFY(view.hasFocus());
 
@@ -2619 +2620 @@
     // hide the popup and check if focus is on the page
     combo->hidePopup();
-    QTRY_VERIFY(view.hasFocus() && !combo->view()->hasFocus()); // Focus should be back on the WebView
+    QTRY_VERIFY(view.hasFocus()); // Focus should be back on the WebView
 }
 #endif