Title: [103410] trunk/Source/WebKit2
- Revision
- 103410
- Author
- [email protected]
- Date
- 2011-12-21 09:03:15 -0800 (Wed, 21 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-21
Reviewed by Kenneth Rohde Christiansen.
Added a viewport meta tag so that the view is actually scrollable and
does not get scaled to not be scrollable. Corrected the style
definition for the <div> tag. Removed unneeded text in div
Rolled back changes some of the changes from the previous patch
(r102453) because they weren't necessary.
* UIProcess/API/qt/tests/html/scroll.html:
* UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:
(tst_QQuickWebView::scrollRequest): Partially rolled back changes.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (103409 => 103410)
--- trunk/Source/WebKit2/ChangeLog 2011-12-21 16:24:52 UTC (rev 103409)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-21 17:03:15 UTC (rev 103410)
@@ -1,3 +1,21 @@
+2011-12-21 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.
+
+ Added a viewport meta tag so that the view is actually scrollable and
+ does not get scaled to not be scrollable. Corrected the style
+ definition for the <div> tag. Removed unneeded text in div
+
+ Rolled back changes some of the changes from the previous patch
+ (r102453) because they weren't necessary.
+
+ * UIProcess/API/qt/tests/html/scroll.html:
+ * UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:
+ (tst_QQuickWebView::scrollRequest): Partially rolled back changes.
+
2011-12-21 Jessie Berlin <[email protected]>
Windows build fix.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/html/scroll.html (103409 => 103410)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/html/scroll.html 2011-12-21 16:24:52 UTC (rev 103409)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/html/scroll.html 2011-12-21 17:03:15 UTC (rev 103410)
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html>
+<meta name="viewport" content="width=200, height=500, user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1"/>
<script type="text/_javascript_">
function pageScroll() {
window.scrollBy(0,50); // horizontal and vertical scroll increments
@@ -13,8 +14,8 @@
div {
font-color: white;
background-color: green;
- width: 300;
- height: 1000;
+ width: 300px;
+ height: 1000px;
}
</style>
@@ -23,8 +24,6 @@
</head>
<body _onload_="pageScroll()">
<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>
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp (103409 => 103410)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp 2011-12-21 16:24:52 UTC (rev 103409)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp 2011-12-21 17:03:15 UTC (rev 103410)
@@ -273,9 +273,6 @@
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())));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
