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

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit c5b82ae34e561620003183451d8737d909f2ffd4
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 29 16:57:07 2010 +0000

    2010-10-29  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Fix tst_QWebFrame on XVFB.
            https://bugs.webkit.org/show_bug.cgi?id=48637
    
            These tests relied on a window manager to activate the window.
    
            Fixes:
            - tst_QWebFrame::popupFocus()
            - tst_QwebFrame::inputFieldFocus()
    
            * tests/qwebframe/tst_qwebframe.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70888 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 236b04e..c0445db 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-29  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Fix tst_QWebFrame on XVFB.
+        https://bugs.webkit.org/show_bug.cgi?id=48637
+
+        These tests relied on a window manager to activate the window.
+
+        Fixes:
+        - tst_QWebFrame::popupFocus()
+        - tst_QwebFrame::inputFieldFocus()
+
+        * tests/qwebframe/tst_qwebframe.cpp:
+
 2010-10-28  Noam Rosenthal  <noam.rosenthal at nokia.com>
 
         Reviewed by Ariya Hidayat.
diff --git a/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index af93fc1..d74b631 100644
--- a/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -2607,6 +2607,7 @@ void tst_QWebFrame::popupFocus()
     view.setFocus();
     view.show();
     QTest::qWaitForWindowShown(&view);
+    view.activateWindow();
     QTRY_VERIFY(view.hasFocus());
 
     // open the popup by clicking. check if focus is on the popup
@@ -2630,6 +2631,7 @@ void tst_QWebFrame::inputFieldFocus()
     view.resize(400, 100);
     view.show();
     QTest::qWaitForWindowShown(&view);
+    view.activateWindow();
     view.setFocus();
     QTRY_VERIFY(view.hasFocus());
 

-- 
WebKit Debian packaging