Title: [118355] trunk/Source/WebKit2
- Revision
- 118355
- Author
- [email protected]
- Date
- 2012-05-24 05:49:50 -0700 (Thu, 24 May 2012)
Log Message
Reorder arguments to compare() in the QML WebView tests
https://bugs.webkit.org/show_bug.cgi?id=87374
Reviewed by Simon Hausmann.
Based on patch by Kenneth Rohde Christiansen.
The reordering is necessary to get correct information printed when
the tests fails. Without this, the test suite will display the bogus
value and not the expected value.
This patch also removes the delayed windowShown since this is not
needed anymore, due to us using the touch events instead of mouse
events.
* UIProcess/API/qt/tests/qmltests/WebView/tst_doubleTapToZoom.qml:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (118354 => 118355)
--- trunk/Source/WebKit2/ChangeLog 2012-05-24 12:49:02 UTC (rev 118354)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-24 12:49:50 UTC (rev 118355)
@@ -1,3 +1,22 @@
+2012-05-24 Alexander Færøy <[email protected]>
+
+ Reorder arguments to compare() in the QML WebView tests
+ https://bugs.webkit.org/show_bug.cgi?id=87374
+
+ Reviewed by Simon Hausmann.
+
+ Based on patch by Kenneth Rohde Christiansen.
+
+ The reordering is necessary to get correct information printed when
+ the tests fails. Without this, the test suite will display the bogus
+ value and not the expected value.
+
+ This patch also removes the delayed windowShown since this is not
+ needed anymore, due to us using the touch events instead of mouse
+ events.
+
+ * UIProcess/API/qt/tests/qmltests/WebView/tst_doubleTapToZoom.qml:
+
2012-05-24 Allan Sandfeld Jensen <[email protected]>
[Qt] Tiles not painted after wheel or keyboard scroll.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_doubleTapToZoom.qml (118354 => 118355)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_doubleTapToZoom.qml 2012-05-24 12:49:02 UTC (rev 118354)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_doubleTapToZoom.qml 2012-05-24 12:49:50 UTC (rev 118355)
@@ -46,15 +46,6 @@
property variant test: webView.experimental.test
- // Delayed windowShown to workaround problems with Qt5 in debug mode.
- when: false
- Timer {
- running: parent.windowShown
- repeat: false
- interval: 1
- onTriggered: parent.when = true
- }
-
function init() {
resultSpy.clear()
scaleSpy.clear()
@@ -92,15 +83,15 @@
webView.url = ""
verify(webView.waitForLoadSucceeded())
- compare("480x720", documentSize())
+ compare(documentSize(), "480x720")
- compare(1.0, test.contentsScale)
+ compare(test.contentsScale, 1.0)
var rect = elementRect("target");
var newScale = webView.width / (rect.width + 2 * 10) // inflated by 10px
doubleTapAtPoint(rect.left + rect.height / 2, rect.top + rect.width / 2)
- compare(newScale, test.contentsScale)
+ compare(test.contentsScale, newScale)
}
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
