Changeset 196719 in webkit


Ignore:
Timestamp:
Feb 17, 2016 1:44:02 PM (8 years ago)
Author:
Simon Fraser
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:
Location:
trunk/LayoutTests
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r196718 r196719  
     12016-02-17  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Add tests for iframe and overflow scrollability after navigating back
     4        https://bugs.webkit.org/show_bug.cgi?id=154300
     5
     6        Fix the tests added in r196665 to be agnostic about how many pixels a wheel event scrolls.
     7
     8        * fast/scrolling/iframe-scrollable-after-back-expected.txt:
     9        * fast/scrolling/iframe-scrollable-after-back.html:
     10        * fast/scrolling/overflow-scrollable-after-back-expected.txt:
     11        * fast/scrolling/overflow-scrollable-after-back.html:
     12
    1132016-02-17  Skachkov Oleksandr  <gskachkov@gmail.com>
    214

  • trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back-expected.txt

    r196665 r196719  
    11
    2 Sending wheel event; scrollTop is 0
    3 Scrolled; scrollTop is 20
     2Sending mouseWheel events
     3PASS: mouseWheel caused scrolling
    44
    55Navigating forward then back
    66
    7 Sending wheel event; scrollTop is 20
    8 Scrolled; scrollTop is 40
     7Sending mouseWheel events
     8PASS: mouseWheel caused scrolling
    99

  • trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back.html

    r196665 r196719  
    2929        }
    3030
     31        var scrollTopBeforeScroll;
    3132        var postScrollCallback;
    3233
    3334        function iframeScrolled()
    3435        {
    35             logResult('Scrolled; scrollTop is ' + document.getElementById('iframe').contentDocument.scrollingElement.scrollTop);
     36            var newScrollTop = document.getElementById('iframe').contentDocument.scrollingElement.scrollTop;
     37            if (newScrollTop > scrollTopBeforeScroll)
     38                logResult('PASS: mouseWheel caused scrolling');
     39            else
     40                logResult('FAIL; mouseWheel did not scroll; scrollTop is ' + newScrollTop + ', was ' + scrollTopBeforeScroll);
     41
    3642            if (postScrollCallback)
    3743                postScrollCallback();
    … …  
    4349            var iframeBounds = iframeTarget.getBoundingClientRect();
    4450           
    45             logResult('Sending wheel event; scrollTop is ' + iframeTarget.contentDocument.scrollingElement.scrollTop);
     51            scrollTopBeforeScroll = iframeTarget.contentDocument.scrollingElement.scrollTop;
     52            logResult('Sending mouseWheel events');
    4653
    4754            eventSender.mouseMoveTo(iframeBounds.left + 10, iframeBounds.top + 10);

  • trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back-expected.txt

    r196665 r196719  
    1 Sending wheel event; scrollTop is 0
    2 Scrolled; scrollTop is 20
     1Sending mouseWheel events
     2PASS: mouseWheel caused scrolling
    33
    44Navigating forward then back
    55
    6 Sending wheel event; scrollTop is 20
    7 Scrolled; scrollTop is 40
     6Sending mouseWheel events
     7PASS: mouseWheel caused scrolling
    88

  • trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back.html

    r196665 r196719  
    2929        }
    3030
     31        var scrollTopBeforeScroll;
    3132        var postScrollCallback;
    3233
    3334        function divScrolled()
    3435        {
    35             logResult('Scrolled; scrollTop is ' + document.getElementById('overflowing').scrollTop);
     36            var newScrollTop = document.getElementById('overflowing').scrollTop;
     37
     38            if (newScrollTop > scrollTopBeforeScroll)
     39                logResult('PASS: mouseWheel caused scrolling');
     40            else
     41                logResult('FAIL; mouseWheel did not scroll; scrollTop is ' + newScrollTop + ', was ' + scrollTopBeforeScroll);
     42
    3643            if (postScrollCallback)
    3744                postScrollCallback();
    … …  
    4350            var divBounds = divTarget.getBoundingClientRect();
    4451           
    45             logResult('Sending wheel event; scrollTop is ' + divTarget.scrollTop);
     52            scrollTopBeforeScroll = divTarget.scrollTop;
     53            logResult('Sending mouseWheel events');
    4654
    4755            eventSender.mouseMoveTo(divBounds.left + 10, divBounds.top + 10);
Note: See TracChangeset for help on using the changeset viewer.