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

Wed Dec 22 12:42:57 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit de02525da1714871fc76ef49e13fd4efa5a60b6c
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 27 18:40:39 2010 +0000

    2010-08-27  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] tst_QWebFrame::inputFieldFocus() fails on MeeGo Handset with QtWebKit 2.1
            https://bugs.webkit.org/show_bug.cgi?id=44703
    
            Make the test more robust to changes in the execution environment.
            The position where the mouse events are sent is now computed from the element geometry,
            this make the test less dependent on the fonts.
    
            The test now also make sure the window manager mapped the window on screen
            before attempting to send the events.
    
            * tests/qwebframe/tst_qwebframe.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66241 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 2060818..f69ba16 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -2,6 +2,22 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        [Qt] tst_QWebFrame::inputFieldFocus() fails on MeeGo Handset with QtWebKit 2.1
+        https://bugs.webkit.org/show_bug.cgi?id=44703
+
+        Make the test more robust to changes in the execution environment.
+        The position where the mouse events are sent is now computed from the element geometry,
+        this make the test less dependent on the fonts.
+
+        The test now also make sure the window manager mapped the window on screen
+        before attempting to send the events.
+
+        * tests/qwebframe/tst_qwebframe.cpp:
+
+2010-08-27  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         [Qt] tst_QWebFrame::hitTestContent() fails on Meego Handset
         https://bugs.webkit.org/show_bug.cgi?id=44701
 
diff --git a/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index 9947779..98ce663 100644
--- a/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -2697,6 +2697,7 @@ void tst_QWebFrame::inputFieldFocus()
     view.setHtml("<html><body><input type=\"text\"></input></body></html>");
     view.resize(400, 100);
     view.show();
+    QTest::qWaitForWindowShown(&view);
     view.setFocus();
     QTRY_VERIFY(view.hasFocus());
 
@@ -2704,7 +2705,8 @@ void tst_QWebFrame::inputFieldFocus()
     int delay = qApp->cursorFlashTime() * 2;
 
     // focus the lineedit and check if it blinks
-    QTest::mouseClick(&view, Qt::LeftButton, 0, QPoint(25, 25));
+    const QWebElement inputElement = view.page()->mainFrame()->documentElement().findFirst(QLatin1String("input[type=text]"));
+    QTest::mouseClick(&view, Qt::LeftButton, 0, inputElement.geometry().center());
     m_inputFieldsTestView = &view;
     view.installEventFilter( this );
     QTest::qWait(delay);

-- 
WebKit Debian packaging

