Title: [102453] trunk/Source/WebKit2
- Revision
- 102453
- Author
- [email protected]
- Date
- 2011-12-09 07:19:05 -0800 (Fri, 09 Dec 2011)
Log Message
[Qt][WK2] Fix tst_QQuickWebView::scrollRequest() API test
https://bugs.webkit.org/show_bug.cgi?id=73994
Patch by Michael Brüning <[email protected]> on 2011-12-09
Reviewed by Kenneth Rohde Christiansen.
* UIProcess/API/qt/tests/html/scroll.html: Corrected html and
added some coloring.
* UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:
(tst_QQuickWebView::scrollRequest): Corrected calculation
of expected value.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (102452 => 102453)
--- trunk/Source/WebKit2/ChangeLog 2011-12-09 14:48:05 UTC (rev 102452)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-09 15:19:05 UTC (rev 102453)
@@ -1,3 +1,16 @@
+2011-12-09 Michael Brüning <[email protected]>
+
+ [Qt][WK2] Fix tst_QQuickWebView::scrollRequest() API test
+ https://bugs.webkit.org/show_bug.cgi?id=73994
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * UIProcess/API/qt/tests/html/scroll.html: Corrected html and
+ added some coloring.
+ * UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:
+ (tst_QQuickWebView::scrollRequest): Corrected calculation
+ of expected value.
+
2011-12-09 Simon Hausmann <[email protected]>
[Qt] Fix compilation with newly separated Qt 5 QtQuick module
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/html/scroll.html (102452 => 102453)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/html/scroll.html 2011-12-09 14:48:05 UTC (rev 102452)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/html/scroll.html 2011-12-09 15:19:05 UTC (rev 102453)
@@ -5,28 +5,26 @@
window.scrollBy(0,50); // horizontal and vertical scroll increments
}
</script>
+<style>
+ body {
+ background-color: blue;
+ margin: 50 50 50 50;
+ }
+ div {
+ font-color: white;
+ background-color: green;
+ width: 300;
+ height: 1000;
+ }
+</style>
+
<head>
-<p>Scroll test </p>
+<title>Scroll test </title>
</head>
<body _onload_="pageScroll()">
-<br><br>
-<p>This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page
-</p>
+<div>
+This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page
+This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page
+</div>
</body>
</html>
-<!DOCTYPE html>
-<html>
-<script type="text/_javascript_">
-function pageScroll() {
- window.scrollBy(0,50); // horizontal and vertical scroll increments
-}
-</script>
-<head>
-<p>Scroll test </p>
-</head>
-<body _onload_="pageScroll()">
-<br><br>
-<p>This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page This is a test page
-</p>
-</body>
-</html>
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp (102452 => 102453)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp 2011-12-09 14:48:05 UTC (rev 102452)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp 2011-12-09 15:19:05 UTC (rev 102453)
@@ -273,12 +273,17 @@
void tst_QQuickWebView::scrollRequest()
{
webView()->setSize(QSizeF(300, 400));
+ m_window->show();
+ webView()->setVisible(true);
+ QTest::qWait(200);
webView()->load(QUrl::fromLocalFile(QLatin1String(TESTS_SOURCE_DIR "/html/scroll.html")));
QVERIFY(waitForSignal(webView(), SIGNAL(loadSucceeded())));
// COMPARE with the position requested in the html
- int y = -50 * webView()->page()->scale();
+ // Use qRound as that is also used when calculating the position
+ // in WebKit.
+ int y = -qRound(50 * webView()->page()->scale());
QVERIFY(webView()->page()->pos().y() == y);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
