Title: [196719] trunk/LayoutTests
- Revision
- 196719
- Author
- [email protected]
- Date
- 2016-02-17 13:44:02 -0800 (Wed, 17 Feb 2016)
Log Message
Add tests for iframe and overflow scrollability after navigating back
https://bugs.webkit.org/show_bug.cgi?id=154300
Fix the tests added in r196665 to be agnostic about how many pixels a wheel event scrolls.
* fast/scrolling/iframe-scrollable-after-back-expected.txt:
* fast/scrolling/iframe-scrollable-after-back.html:
* fast/scrolling/overflow-scrollable-after-back-expected.txt:
* fast/scrolling/overflow-scrollable-after-back.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (196718 => 196719)
--- trunk/LayoutTests/ChangeLog 2016-02-17 21:33:34 UTC (rev 196718)
+++ trunk/LayoutTests/ChangeLog 2016-02-17 21:44:02 UTC (rev 196719)
@@ -1,3 +1,15 @@
+2016-02-17 Simon Fraser <[email protected]>
+
+ Add tests for iframe and overflow scrollability after navigating back
+ https://bugs.webkit.org/show_bug.cgi?id=154300
+
+ Fix the tests added in r196665 to be agnostic about how many pixels a wheel event scrolls.
+
+ * fast/scrolling/iframe-scrollable-after-back-expected.txt:
+ * fast/scrolling/iframe-scrollable-after-back.html:
+ * fast/scrolling/overflow-scrollable-after-back-expected.txt:
+ * fast/scrolling/overflow-scrollable-after-back.html:
+
2016-02-17 Skachkov Oleksandr <[email protected]>
[ES6] Arrow function. Arrow function should raise exception ReferenceError only when access to 'arguments' on top level
Modified: trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back-expected.txt (196718 => 196719)
--- trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back-expected.txt 2016-02-17 21:33:34 UTC (rev 196718)
+++ trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back-expected.txt 2016-02-17 21:44:02 UTC (rev 196719)
@@ -1,9 +1,9 @@
-Sending wheel event; scrollTop is 0
-Scrolled; scrollTop is 20
+Sending mouseWheel events
+PASS: mouseWheel caused scrolling
Navigating forward then back
-Sending wheel event; scrollTop is 20
-Scrolled; scrollTop is 40
+Sending mouseWheel events
+PASS: mouseWheel caused scrolling
Modified: trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back.html (196718 => 196719)
--- trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back.html 2016-02-17 21:33:34 UTC (rev 196718)
+++ trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back.html 2016-02-17 21:44:02 UTC (rev 196719)
@@ -28,11 +28,17 @@
document.getElementById('result').textContent += s + "\n";
}
+ var scrollTopBeforeScroll;
var postScrollCallback;
function iframeScrolled()
{
- logResult('Scrolled; scrollTop is ' + document.getElementById('iframe').contentDocument.scrollingElement.scrollTop);
+ var newScrollTop = document.getElementById('iframe').contentDocument.scrollingElement.scrollTop;
+ if (newScrollTop > scrollTopBeforeScroll)
+ logResult('PASS: mouseWheel caused scrolling');
+ else
+ logResult('FAIL; mouseWheel did not scroll; scrollTop is ' + newScrollTop + ', was ' + scrollTopBeforeScroll);
+
if (postScrollCallback)
postScrollCallback();
}
@@ -42,7 +48,8 @@
var iframeTarget = document.getElementById('iframe');
var iframeBounds = iframeTarget.getBoundingClientRect();
- logResult('Sending wheel event; scrollTop is ' + iframeTarget.contentDocument.scrollingElement.scrollTop);
+ scrollTopBeforeScroll = iframeTarget.contentDocument.scrollingElement.scrollTop;
+ logResult('Sending mouseWheel events');
eventSender.mouseMoveTo(iframeBounds.left + 10, iframeBounds.top + 10);
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
Modified: trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back-expected.txt (196718 => 196719)
--- trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back-expected.txt 2016-02-17 21:33:34 UTC (rev 196718)
+++ trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back-expected.txt 2016-02-17 21:44:02 UTC (rev 196719)
@@ -1,8 +1,8 @@
-Sending wheel event; scrollTop is 0
-Scrolled; scrollTop is 20
+Sending mouseWheel events
+PASS: mouseWheel caused scrolling
Navigating forward then back
-Sending wheel event; scrollTop is 20
-Scrolled; scrollTop is 40
+Sending mouseWheel events
+PASS: mouseWheel caused scrolling
Modified: trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back.html (196718 => 196719)
--- trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back.html 2016-02-17 21:33:34 UTC (rev 196718)
+++ trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back.html 2016-02-17 21:44:02 UTC (rev 196719)
@@ -28,11 +28,18 @@
document.getElementById('result').textContent += s + "\n";
}
+ var scrollTopBeforeScroll;
var postScrollCallback;
function divScrolled()
{
- logResult('Scrolled; scrollTop is ' + document.getElementById('overflowing').scrollTop);
+ var newScrollTop = document.getElementById('overflowing').scrollTop;
+
+ if (newScrollTop > scrollTopBeforeScroll)
+ logResult('PASS: mouseWheel caused scrolling');
+ else
+ logResult('FAIL; mouseWheel did not scroll; scrollTop is ' + newScrollTop + ', was ' + scrollTopBeforeScroll);
+
if (postScrollCallback)
postScrollCallback();
}
@@ -42,7 +49,8 @@
var divTarget = document.getElementById('overflowing');
var divBounds = divTarget.getBoundingClientRect();
- logResult('Sending wheel event; scrollTop is ' + divTarget.scrollTop);
+ scrollTopBeforeScroll = divTarget.scrollTop;
+ logResult('Sending mouseWheel events');
eventSender.mouseMoveTo(divBounds.left + 10, divBounds.top + 10);
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
