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

Wed Dec 22 12:42:22 UTC 2010

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

    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
    
            Make the test more robust. The position of the text is not relying
            on the size of the fonts anymore.
    
            * tests/qwebframe/tst_qwebframe.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66219 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index a402763..2060818 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+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
+
+        Make the test more robust. The position of the text is not relying
+        on the size of the fonts anymore.
+
+        * tests/qwebframe/tst_qwebframe.cpp:
+
 2010-08-26  Antonio Gomes  <tonikitoo at webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index 64971d0..9947779 100644
--- a/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -2714,13 +2714,14 @@ void tst_QWebFrame::inputFieldFocus()
 
 void tst_QWebFrame::hitTestContent()
 {
-    QString html("<html><body><p>A paragraph</p><br/><br/><br/><a href=\"about:blank\" target=\"_foo\">link text</a></body></html>");
+    QString html("<html><body><p>A paragraph</p><br/><br/><br/><a href=\"about:blank\" target=\"_foo\" id=\"link\">link text</a></body></html>");
 
     QWebPage page;
     QWebFrame* frame = page.mainFrame();
     frame->setHtml(html);
     page.setViewportSize(QSize(200, 0)); //no height so link is not visible
-    QWebHitTestResult result = frame->hitTestContent(QPoint(10, 100));
+    const QWebElement linkElement = frame->documentElement().findFirst(QLatin1String("a#link"));
+    QWebHitTestResult result = frame->hitTestContent(linkElement.geometry().center());
     QCOMPARE(result.linkText(), QString("link text"));
     QWebElement link = result.linkElement();
     QCOMPARE(link.attribute("target"), QString("_foo"));

-- 
WebKit Debian packaging

