Changeset 254839 in webkit


Ignore:
Timestamp:
Jan 20, 2020 5:35:42 PM (4 years ago)
Author:
Fujii Hironori
Message:

Unreviewed, rolling out r254807.

Breaks Apple internal builds.

Reverted changeset:

"Add support for scroll behavior relies on ScrollAnimation of
the Web process"
​https://bugs.webkit.org/show_bug.cgi?id=204882
​https://trac.webkit.org/changeset/254807

Location:
trunk
Files:
47 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r254835 r254839  
     12020-01-20  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Unreviewed, rolling out r254807.
     4
     5        Breaks Apple internal builds.
     6
     7        Reverted changeset:
     8
     9        "Add support for scroll behavior relies on ScrollAnimation of
     10        the Web process"
     11        https://bugs.webkit.org/show_bug.cgi?id=204882
     12        https://trac.webkit.org/changeset/254807
     13
    1142020-01-20  Devin Rousso  <drousso@apple.com>
    215

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r254821 r254839  
     12020-01-20  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Unreviewed, rolling out r254807.
     4
     5        Breaks Apple internal builds.
     6
     7        Reverted changeset:
     8
     9        "Add support for scroll behavior relies on ScrollAnimation of
     10        the Web process"
     11        https://bugs.webkit.org/show_bug.cgi?id=204882
     12        https://trac.webkit.org/changeset/254807
     13
    1142020-01-20  Rob Buis  <rbuis@igalia.com>
    215

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-default-css-expected.txt

    r254807 r254839  
    11
    22PASS Instant scrolling of an element with default scroll-behavior
    3 PASS Smooth scrolling of an element with default scroll-behavior
     3FAIL Smooth scrolling of an element with default scroll-behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    44

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-default-css.html

    r254807 r254839  
    1 <!DOCTYPE html><!-- webkit-test-runner [ experimental:CSSOMViewSmoothScrollingEnabled=true ] -->
     1<!DOCTYPE html>
    22<title>Testing default value of scroll-behavior</title>
    33<meta name="timeout" content="long"/>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-element-expected.txt

    r254807 r254839  
    33PASS Element with auto scroll-behavior ; scroll() with auto behavior
    44PASS Element with auto scroll-behavior ; scroll() with instant behavior
    5 PASS Element with auto scroll-behavior ; scroll() with smooth behavior
    6 PASS Element with smooth scroll-behavior ; scroll() with default behavior
    7 PASS Element with smooth scroll-behavior ; scroll() with auto behavior
     5FAIL Element with auto scroll-behavior ; scroll() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     6FAIL Element with smooth scroll-behavior ; scroll() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     7FAIL Element with smooth scroll-behavior ; scroll() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    88PASS Element with smooth scroll-behavior ; scroll() with instant behavior
    9 PASS Element with smooth scroll-behavior ; scroll() with smooth behavior
     9FAIL Element with smooth scroll-behavior ; scroll() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    1010PASS Element with auto scroll-behavior ; scrollTo() with default behavior
    1111PASS Element with auto scroll-behavior ; scrollTo() with auto behavior
    1212PASS Element with auto scroll-behavior ; scrollTo() with instant behavior
    13 PASS Element with auto scroll-behavior ; scrollTo() with smooth behavior
    14 PASS Element with smooth scroll-behavior ; scrollTo() with default behavior
    15 PASS Element with smooth scroll-behavior ; scrollTo() with auto behavior
     13FAIL Element with auto scroll-behavior ; scrollTo() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     14FAIL Element with smooth scroll-behavior ; scrollTo() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     15FAIL Element with smooth scroll-behavior ; scrollTo() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    1616PASS Element with smooth scroll-behavior ; scrollTo() with instant behavior
    17 PASS Element with smooth scroll-behavior ; scrollTo() with smooth behavior
     17FAIL Element with smooth scroll-behavior ; scrollTo() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    1818PASS Element with auto scroll-behavior ; scrollBy() with default behavior
    1919PASS Element with auto scroll-behavior ; scrollBy() with auto behavior
    2020PASS Element with auto scroll-behavior ; scrollBy() with instant behavior
    21 PASS Element with auto scroll-behavior ; scrollBy() with smooth behavior
    22 PASS Element with smooth scroll-behavior ; scrollBy() with default behavior
    23 PASS Element with smooth scroll-behavior ; scrollBy() with auto behavior
     21FAIL Element with auto scroll-behavior ; scrollBy() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     22FAIL Element with smooth scroll-behavior ; scrollBy() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     23FAIL Element with smooth scroll-behavior ; scrollBy() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    2424PASS Element with smooth scroll-behavior ; scrollBy() with instant behavior
    25 PASS Element with smooth scroll-behavior ; scrollBy() with smooth behavior
     25FAIL Element with smooth scroll-behavior ; scrollBy() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    2626PASS Element with auto scroll-behavior ; scrollIntoView() with default behavior
    2727PASS Element with auto scroll-behavior ; scrollIntoView() with auto behavior
    2828PASS Element with auto scroll-behavior ; scrollIntoView() with instant behavior
    29 PASS Element with auto scroll-behavior ; scrollIntoView() with smooth behavior
    30 PASS Element with smooth scroll-behavior ; scrollIntoView() with default behavior
    31 PASS Element with smooth scroll-behavior ; scrollIntoView() with auto behavior
     29FAIL Element with auto scroll-behavior ; scrollIntoView() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     30FAIL Element with smooth scroll-behavior ; scrollIntoView() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     31FAIL Element with smooth scroll-behavior ; scrollIntoView() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    3232PASS Element with smooth scroll-behavior ; scrollIntoView() with instant behavior
    33 PASS Element with smooth scroll-behavior ; scrollIntoView() with smooth behavior
     33FAIL Element with smooth scroll-behavior ; scrollIntoView() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    3434PASS Set scrollLeft to element with auto scroll-behavior
    35 PASS Set scrollLeft to element with smooth scroll-behavior
     35FAIL Set scrollLeft to element with smooth scroll-behavior assert_less_than: Shouldn't set scroll attribute immediately expected a number less than 500 but got 500
    3636PASS Set scrollTop to element with auto scroll-behavior
    37 PASS Set scrollTop to element with smooth scroll-behavior
     37FAIL Set scrollTop to element with smooth scroll-behavior assert_less_than: Shouldn't set scroll attribute immediately expected a number less than 250 but got 250
    3838PASS Aborting an ongoing smooth scrolling on an element with another smooth scrolling
    3939PASS Aborting an ongoing smooth scrolling on an element with an instant scrolling

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-element.html

    r254807 r254839  
    1 <!DOCTYPE html><!-- webkit-test-runner [ experimental:CSSOMViewSmoothScrollingEnabled=true ] -->
     1<!DOCTYPE html>
    22<title>Testing scrollOptions' behavior for Element.scroll* and scroll-behavior on an element</title>
    33<meta name="timeout" content="long"/>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root-expected.txt

    r254807 r254839  
    44PASS Main frame with auto scroll-behavior ; scroll() with auto behavior
    55PASS Main frame with auto scroll-behavior ; scroll() with instant behavior
    6 PASS Main frame with auto scroll-behavior ; scroll() with smooth behavior
    7 PASS Main frame with smooth scroll-behavior ; scroll() with default behavior
    8 PASS Main frame with smooth scroll-behavior ; scroll() with auto behavior
     6FAIL Main frame with auto scroll-behavior ; scroll() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     7FAIL Main frame with smooth scroll-behavior ; scroll() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     8FAIL Main frame with smooth scroll-behavior ; scroll() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    99PASS Main frame with smooth scroll-behavior ; scroll() with instant behavior
    10 PASS Main frame with smooth scroll-behavior ; scroll() with smooth behavior
     10FAIL Main frame with smooth scroll-behavior ; scroll() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    1111PASS Main frame with auto scroll-behavior ; scrollTo() with default behavior
    1212PASS Main frame with auto scroll-behavior ; scrollTo() with auto behavior
    1313PASS Main frame with auto scroll-behavior ; scrollTo() with instant behavior
    14 PASS Main frame with auto scroll-behavior ; scrollTo() with smooth behavior
    15 PASS Main frame with smooth scroll-behavior ; scrollTo() with default behavior
    16 PASS Main frame with smooth scroll-behavior ; scrollTo() with auto behavior
     14FAIL Main frame with auto scroll-behavior ; scrollTo() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     15FAIL Main frame with smooth scroll-behavior ; scrollTo() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     16FAIL Main frame with smooth scroll-behavior ; scrollTo() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    1717PASS Main frame with smooth scroll-behavior ; scrollTo() with instant behavior
    18 PASS Main frame with smooth scroll-behavior ; scrollTo() with smooth behavior
     18FAIL Main frame with smooth scroll-behavior ; scrollTo() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    1919PASS Main frame with auto scroll-behavior ; scrollBy() with default behavior
    2020PASS Main frame with auto scroll-behavior ; scrollBy() with auto behavior
    2121PASS Main frame with auto scroll-behavior ; scrollBy() with instant behavior
    22 PASS Main frame with auto scroll-behavior ; scrollBy() with smooth behavior
    23 PASS Main frame with smooth scroll-behavior ; scrollBy() with default behavior
    24 PASS Main frame with smooth scroll-behavior ; scrollBy() with auto behavior
     22FAIL Main frame with auto scroll-behavior ; scrollBy() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     23FAIL Main frame with smooth scroll-behavior ; scrollBy() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     24FAIL Main frame with smooth scroll-behavior ; scrollBy() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    2525PASS Main frame with smooth scroll-behavior ; scrollBy() with instant behavior
    26 PASS Main frame with smooth scroll-behavior ; scrollBy() with smooth behavior
     26FAIL Main frame with smooth scroll-behavior ; scrollBy() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    2727PASS Main frame with auto scroll-behavior ; scrollIntoView() with default behavior
    2828PASS Main frame with auto scroll-behavior ; scrollIntoView() with auto behavior
    2929PASS Main frame with auto scroll-behavior ; scrollIntoView() with instant behavior
    30 PASS Main frame with auto scroll-behavior ; scrollIntoView() with smooth behavior
    31 PASS Main frame with smooth scroll-behavior ; scrollIntoView() with default behavior
    32 PASS Main frame with smooth scroll-behavior ; scrollIntoView() with auto behavior
     30FAIL Main frame with auto scroll-behavior ; scrollIntoView() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     31FAIL Main frame with smooth scroll-behavior ; scrollIntoView() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     32FAIL Main frame with smooth scroll-behavior ; scrollIntoView() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    3333PASS Main frame with smooth scroll-behavior ; scrollIntoView() with instant behavior
    34 PASS Main frame with smooth scroll-behavior ; scrollIntoView() with smooth behavior
     34FAIL Main frame with smooth scroll-behavior ; scrollIntoView() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    3535PASS Set scrollLeft to frame with auto scroll-behavior
    36 PASS Set scrollLeft to frame with smooth scroll-behavior
     36FAIL Set scrollLeft to frame with smooth scroll-behavior assert_less_than: Shouldn't set scroll attribute immediately expected a number less than 2430 but got 2430
    3737PASS Set scrollTop to frame with auto scroll-behavior
    38 PASS Set scrollTop to frame with smooth scroll-behavior
     38FAIL Set scrollTop to frame with smooth scroll-behavior assert_less_than: Shouldn't set scroll attribute immediately expected a number less than 2480 but got 2480
    3939PASS Aborting an ongoing smooth scrolling on the main frame with another smooth scrolling
    4040PASS Aborting an ongoing smooth scrolling on the main frame with an instant scrolling

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root.html

    r254807 r254839  
    1 <!DOCTYPE html><!-- webkit-test-runner [ experimental:CSSOMViewSmoothScrollingEnabled=true ] -->
     1<!DOCTYPE html>
    22<title>Testing scrollOptions' behavior for Element.scroll* and scroll-behavior on the root of the main frame</title>
    33<meta name="timeout" content="long"/>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-window-expected.txt

    r254807 r254839  
    44PASS Main frame with auto scroll-behavior ; scroll() with auto behavior
    55PASS Main frame with auto scroll-behavior ; scroll() with instant behavior
    6 PASS Main frame with auto scroll-behavior ; scroll() with smooth behavior
    7 PASS Main frame with smooth scroll-behavior ; scroll() with default behavior
    8 PASS Main frame with smooth scroll-behavior ; scroll() with auto behavior
     6FAIL Main frame with auto scroll-behavior ; scroll() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     7FAIL Main frame with smooth scroll-behavior ; scroll() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     8FAIL Main frame with smooth scroll-behavior ; scroll() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    99PASS Main frame with smooth scroll-behavior ; scroll() with instant behavior
    10 PASS Main frame with smooth scroll-behavior ; scroll() with smooth behavior
     10FAIL Main frame with smooth scroll-behavior ; scroll() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    1111PASS Main frame with auto scroll-behavior ; scrollTo() with default behavior
    1212PASS Main frame with auto scroll-behavior ; scrollTo() with auto behavior
    1313PASS Main frame with auto scroll-behavior ; scrollTo() with instant behavior
    14 PASS Main frame with auto scroll-behavior ; scrollTo() with smooth behavior
    15 PASS Main frame with smooth scroll-behavior ; scrollTo() with default behavior
    16 PASS Main frame with smooth scroll-behavior ; scrollTo() with auto behavior
     14FAIL Main frame with auto scroll-behavior ; scrollTo() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     15FAIL Main frame with smooth scroll-behavior ; scrollTo() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     16FAIL Main frame with smooth scroll-behavior ; scrollTo() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    1717PASS Main frame with smooth scroll-behavior ; scrollTo() with instant behavior
    18 PASS Main frame with smooth scroll-behavior ; scrollTo() with smooth behavior
     18FAIL Main frame with smooth scroll-behavior ; scrollTo() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    1919PASS Main frame with auto scroll-behavior ; scrollBy() with default behavior
    2020PASS Main frame with auto scroll-behavior ; scrollBy() with auto behavior
    2121PASS Main frame with auto scroll-behavior ; scrollBy() with instant behavior
    22 PASS Main frame with auto scroll-behavior ; scrollBy() with smooth behavior
    23 PASS Main frame with smooth scroll-behavior ; scrollBy() with default behavior
    24 PASS Main frame with smooth scroll-behavior ; scrollBy() with auto behavior
     22FAIL Main frame with auto scroll-behavior ; scrollBy() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     23FAIL Main frame with smooth scroll-behavior ; scrollBy() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
     24FAIL Main frame with smooth scroll-behavior ; scrollBy() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    2525PASS Main frame with smooth scroll-behavior ; scrollBy() with instant behavior
    26 PASS Main frame with smooth scroll-behavior ; scrollBy() with smooth behavior
     26FAIL Main frame with smooth scroll-behavior ; scrollBy() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 2430 but got 2430
    2727PASS Aborting an ongoing smooth scrolling on the main frame with another smooth scrolling
    2828PASS Aborting an ongoing smooth scrolling on the main frame with an instant scrolling

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-window.html

    r254807 r254839  
    1 <!DOCTYPE html><!-- webkit-test-runner [ experimental:CSSOMViewSmoothScrollingEnabled=true ] -->
     1<!DOCTYPE html>
    22<title>Testing scrollOptions' behavior for Element.scroll* on the window of the main frame</title>
    33<meta name="timeout" content="long"/>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-scrollintoview-nested-expected.txt

    r254807 r254839  
    11
    2 PASS scrollIntoView with nested elements with different scroll-behavior
     2FAIL scrollIntoView with nested elements with different scroll-behavior assert_less_than: Element with smooth behavior should not scroll immediately expected a number less than 500 but got 500
    33

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-scrollintoview-nested.html

    r254807 r254839  
    1 <!DOCTYPE html><!-- webkit-test-runner [ experimental:CSSOMViewSmoothScrollingEnabled=true ] -->
     1<!DOCTYPE html>
    22<title>Testing scrollOptions' behavior with scrollIntoView for nested scrolling nodes</title>
    33<meta name="timeout" content="long"/>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-smooth-positions.html

    r254807 r254839  
    1 <!DOCTYPE html><!-- webkit-test-runner [ experimental:CSSOMViewSmoothScrollingEnabled=true ] -->
     1<!DOCTYPE html>
    22<title>Testing scroll positions when scrolling an element with smooth behavior</title>
    33<meta name="timeout" content="long"/>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-subframe-root-expected.txt

    r254807 r254839  
    44PASS Subframe with auto scroll-behavior ; scroll() with auto behavior
    55PASS Subframe with auto scroll-behavior ; scroll() with instant behavior
    6 PASS Subframe with auto scroll-behavior ; scroll() with smooth behavior
    7 PASS Subframe with smooth scroll-behavior ; scroll() with default behavior
    8 PASS Subframe with smooth scroll-behavior ; scroll() with auto behavior
     6FAIL Subframe with auto scroll-behavior ; scroll() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     7FAIL Subframe with smooth scroll-behavior ; scroll() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     8FAIL Subframe with smooth scroll-behavior ; scroll() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    99PASS Subframe with smooth scroll-behavior ; scroll() with instant behavior
    10 PASS Subframe with smooth scroll-behavior ; scroll() with smooth behavior
     10FAIL Subframe with smooth scroll-behavior ; scroll() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    1111PASS Subframe with auto scroll-behavior ; scrollTo() with default behavior
    1212PASS Subframe with auto scroll-behavior ; scrollTo() with auto behavior
    1313PASS Subframe with auto scroll-behavior ; scrollTo() with instant behavior
    14 PASS Subframe with auto scroll-behavior ; scrollTo() with smooth behavior
    15 PASS Subframe with smooth scroll-behavior ; scrollTo() with default behavior
    16 PASS Subframe with smooth scroll-behavior ; scrollTo() with auto behavior
     14FAIL Subframe with auto scroll-behavior ; scrollTo() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     15FAIL Subframe with smooth scroll-behavior ; scrollTo() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     16FAIL Subframe with smooth scroll-behavior ; scrollTo() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    1717PASS Subframe with smooth scroll-behavior ; scrollTo() with instant behavior
    18 PASS Subframe with smooth scroll-behavior ; scrollTo() with smooth behavior
     18FAIL Subframe with smooth scroll-behavior ; scrollTo() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    1919PASS Subframe with auto scroll-behavior ; scrollBy() with default behavior
    2020PASS Subframe with auto scroll-behavior ; scrollBy() with auto behavior
    2121PASS Subframe with auto scroll-behavior ; scrollBy() with instant behavior
    22 PASS Subframe with auto scroll-behavior ; scrollBy() with smooth behavior
    23 PASS Subframe with smooth scroll-behavior ; scrollBy() with default behavior
    24 PASS Subframe with smooth scroll-behavior ; scrollBy() with auto behavior
     22FAIL Subframe with auto scroll-behavior ; scrollBy() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     23FAIL Subframe with smooth scroll-behavior ; scrollBy() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     24FAIL Subframe with smooth scroll-behavior ; scrollBy() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    2525PASS Subframe with smooth scroll-behavior ; scrollBy() with instant behavior
    26 PASS Subframe with smooth scroll-behavior ; scrollBy() with smooth behavior
     26FAIL Subframe with smooth scroll-behavior ; scrollBy() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    2727PASS Subframe with auto scroll-behavior ; scrollIntoView() with default behavior
    2828PASS Subframe with auto scroll-behavior ; scrollIntoView() with auto behavior
    2929PASS Subframe with auto scroll-behavior ; scrollIntoView() with instant behavior
    30 PASS Subframe with auto scroll-behavior ; scrollIntoView() with smooth behavior
    31 PASS Subframe with smooth scroll-behavior ; scrollIntoView() with default behavior
    32 PASS Subframe with smooth scroll-behavior ; scrollIntoView() with auto behavior
     30FAIL Subframe with auto scroll-behavior ; scrollIntoView() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     31FAIL Subframe with smooth scroll-behavior ; scrollIntoView() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     32FAIL Subframe with smooth scroll-behavior ; scrollIntoView() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    3333PASS Subframe with smooth scroll-behavior ; scrollIntoView() with instant behavior
    34 PASS Subframe with smooth scroll-behavior ; scrollIntoView() with smooth behavior
     34FAIL Subframe with smooth scroll-behavior ; scrollIntoView() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    3535PASS Subframe setting scrollLeft with auto scroll-behavior
    36 PASS Subframe setting scrollLeft with smooth scroll-behavior
     36FAIL Subframe setting scrollLeft with smooth scroll-behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    3737PASS Subframe setting scrollTop with auto scroll-behavior
    38 PASS Subframe setting scrollTop with smooth scroll-behavior
     38FAIL Subframe setting scrollTop with smooth scroll-behavior assert_less_than: Should not set scrollTop immediately expected a number less than 250 but got 250
    3939PASS Aborting an ongoing smooth scrolling on a subframe with another smooth scrolling
    4040PASS Aborting an ongoing smooth scrolling on a subframe with an instant scrolling

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-subframe-root.html

    r254807 r254839  
    1 <!DOCTYPE html><!-- webkit-test-runner [ experimental:CSSOMViewSmoothScrollingEnabled=true ] -->
     1<!DOCTYPE html>
    22<title>Testing scrollOptions' behavior for Element.scroll* and scroll-behavior on the root of a subframe</title>
    33<meta name="timeout" content="long"/>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-subframe-window-expected.txt

    r254807 r254839  
    44PASS Main frame with auto scroll-behavior ; scroll() with auto behavior
    55PASS Main frame with auto scroll-behavior ; scroll() with instant behavior
    6 PASS Main frame with auto scroll-behavior ; scroll() with smooth behavior
    7 PASS Main frame with smooth scroll-behavior ; scroll() with default behavior
    8 PASS Main frame with smooth scroll-behavior ; scroll() with auto behavior
     6FAIL Main frame with auto scroll-behavior ; scroll() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     7FAIL Main frame with smooth scroll-behavior ; scroll() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     8FAIL Main frame with smooth scroll-behavior ; scroll() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    99PASS Main frame with smooth scroll-behavior ; scroll() with instant behavior
    10 PASS Main frame with smooth scroll-behavior ; scroll() with smooth behavior
     10FAIL Main frame with smooth scroll-behavior ; scroll() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    1111PASS Main frame with auto scroll-behavior ; scrollTo() with default behavior
    1212PASS Main frame with auto scroll-behavior ; scrollTo() with auto behavior
    1313PASS Main frame with auto scroll-behavior ; scrollTo() with instant behavior
    14 PASS Main frame with auto scroll-behavior ; scrollTo() with smooth behavior
    15 PASS Main frame with smooth scroll-behavior ; scrollTo() with default behavior
    16 PASS Main frame with smooth scroll-behavior ; scrollTo() with auto behavior
     14FAIL Main frame with auto scroll-behavior ; scrollTo() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     15FAIL Main frame with smooth scroll-behavior ; scrollTo() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     16FAIL Main frame with smooth scroll-behavior ; scrollTo() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    1717PASS Main frame with smooth scroll-behavior ; scrollTo() with instant behavior
    18 PASS Main frame with smooth scroll-behavior ; scrollTo() with smooth behavior
     18FAIL Main frame with smooth scroll-behavior ; scrollTo() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    1919PASS Main frame with auto scroll-behavior ; scrollBy() with default behavior
    2020PASS Main frame with auto scroll-behavior ; scrollBy() with auto behavior
    2121PASS Main frame with auto scroll-behavior ; scrollBy() with instant behavior
    22 PASS Main frame with auto scroll-behavior ; scrollBy() with smooth behavior
    23 PASS Main frame with smooth scroll-behavior ; scrollBy() with default behavior
    24 PASS Main frame with smooth scroll-behavior ; scrollBy() with auto behavior
     22FAIL Main frame with auto scroll-behavior ; scrollBy() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     23FAIL Main frame with smooth scroll-behavior ; scrollBy() with default behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
     24FAIL Main frame with smooth scroll-behavior ; scrollBy() with auto behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    2525PASS Main frame with smooth scroll-behavior ; scrollBy() with instant behavior
    26 PASS Main frame with smooth scroll-behavior ; scrollBy() with smooth behavior
     26FAIL Main frame with smooth scroll-behavior ; scrollBy() with smooth behavior assert_less_than: Should not set scrollLeft immediately expected a number less than 500 but got 500
    2727PASS Aborting an ongoing smooth scrolling on the main frame with another smooth scrolling
    2828PASS Aborting an ongoing smooth scrolling on the main frame with an instant scrolling

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-subframe-window.html

    r254807 r254839  
    1 <!DOCTYPE html><!-- webkit-test-runner [ experimental:CSSOMViewSmoothScrollingEnabled=true ] -->
     1<!DOCTYPE html>
    22<title>Testing scrollOptions' behavior for Element.scroll* and scroll-behavior on the root of a subframe</title>
    33<meta name="timeout" content="long"/>

  • trunk/LayoutTests/platform/mac-wk1/TestExpectations

    r254807 r254839  
    750750webkit.org/b/188070 imported/w3c/web-platform-tests/streams/piping/error-propagation-backward.html [ Pass Failure ]
    751751
    752 # Tests for smooth scroll behavior do not all work and they are slow, so let's just skip them.
    753 webkit.org/b/191357 imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root.html [ Skip ]
    754 webkit.org/b/191357 imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-window.html [ Skip ]
    755 webkit.org/b/191357 imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-subframe-root.html [ Skip ]
    756 webkit.org/b/191357 imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-subframe-window.html [ Skip ]
    757 
    758752webkit.org/b/189908 imported/w3c/web-platform-tests/resource-timing/resource_timing.worker.html [ Failure ]
    759753

  • trunk/Source/WebCore/ChangeLog

    r254837 r254839  
     12020-01-20  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Unreviewed, rolling out r254807.
     4
     5        Breaks Apple internal builds.
     6
     7        Reverted changeset:
     8
     9        "Add support for scroll behavior relies on ScrollAnimation of
     10        the Web process"
     11        https://bugs.webkit.org/show_bug.cgi?id=204882
     12        https://trac.webkit.org/changeset/254807
     13
    1142020-01-20  Zalan Bujtas  <zalan@apple.com>
    215

  • trunk/Source/WebCore/Sources.txt

    r254807 r254839  
    17641764platform/SSLKeyGenerator.cpp
    17651765platform/ScrollAnimator.cpp
    1766 platform/ScrollAnimationSmooth.cpp
    17671766platform/ScrollView.cpp
    17681767platform/ScrollableArea.cpp

  • trunk/Source/WebCore/SourcesGTK.txt

    r254807 r254839  
    6464
    6565platform/ScrollAnimationKinetic.cpp
     66platform/ScrollAnimationSmooth.cpp
    6667platform/UserAgentQuirks.cpp
    6768

  • trunk/Source/WebCore/dom/Element.cpp

    r254807 r254839  
    841841    LayoutRect absoluteBounds = renderer()->absoluteAnchorRect(&insideFixed);
    842842
     843    // FIXME(webkit.org/b/188043): Support ScrollBehavior.
    843844    ScrollIntoViewOptions options;
    844845    if (arg) {
    … …  
    859860        isHorizontal ? alignX : alignY,
    860861        isHorizontal ? alignY : alignX,
    861         ShouldAllowCrossOriginScrolling::No,
    862         options.behavior.valueOr(ScrollBehavior::Auto)
     862        ShouldAllowCrossOriginScrolling::No
    863863    };
    864864    renderer()->scrollRectToVisible(absoluteBounds, insideFixed, visibleOptions);
    … …  
    921921void Element::scrollBy(double x, double y)
    922922{
    923     scrollBy(ScrollToOptions(x, y));
     923    scrollBy({ x, y });
    924924}
    925925
    … …  
    957957        adjustForAbsoluteZoom(renderer->scrollTop(), *renderer)
    958958    );
    959     IntPoint scrollPosition(
    960         clampToInteger(scrollToOptions.left.value() * renderer->style().effectiveZoom()),
    961         clampToInteger(scrollToOptions.top.value() * renderer->style().effectiveZoom())
    962     );
    963     bool animated = useSmoothScrolling(scrollToOptions.behavior.valueOr(ScrollBehavior::Auto), *this);
    964     renderer->setScrollPosition(scrollPosition, ScrollType::Programmatic, animated, clamping);
     959    renderer->setScrollLeft(clampToInteger(scrollToOptions.left.value() * renderer->style().effectiveZoom()), ScrollType::Programmatic, clamping);
     960    renderer->setScrollTop(clampToInteger(scrollToOptions.top.value() * renderer->style().effectiveZoom()), ScrollType::Programmatic, clamping);
    965961}
    966962
    967963void Element::scrollTo(double x, double y)
    968964{
    969     scrollTo(ScrollToOptions(x, y));
     965    scrollTo({ x, y });
    970966}
    971967
    … …  
    13011297
    13021298    if (document().scrollingElement() == this) {
    1303         if (auto* frame = documentFrameWithNonNullView()) {
    1304             // FIXME: Should we use document()->scrollingElement()?
    1305             // See https://bugs.webkit.org/show_bug.cgi?id=205059
    1306             bool animated = document().documentElement() && useSmoothScrolling(ScrollBehavior::Auto, *document().documentElement());
    1307             frame->view()->setScrollPosition(IntPoint(static_cast<int>(newLeft * frame->pageZoomFactor() * frame->frameScaleFactor()), frame->view()->scrollY()), animated);
    1308         }
     1299        if (auto* frame = documentFrameWithNonNullView())
     1300            frame->view()->setScrollPosition(IntPoint(static_cast<int>(newLeft * frame->pageZoomFactor() * frame->frameScaleFactor()), frame->view()->scrollY()));
    13091301        return;
    13101302    }
    13111303
    13121304    if (auto* renderer = renderBox()) {
    1313         int clampedLeft = clampToInteger(newLeft * renderer->style().effectiveZoom());
    1314         bool animated = useSmoothScrolling(ScrollBehavior::Auto, *this);
    1315         renderer->setScrollLeft(clampedLeft, ScrollType::Programmatic, animated);
     1305        renderer->setScrollLeft(static_cast<int>(newLeft * renderer->style().effectiveZoom()), ScrollType::Programmatic);
    13161306        if (auto* scrollableArea = renderer->layer())
    13171307            scrollableArea->setScrollShouldClearLatchedState(true);
    … …  
    13241314
    13251315    if (document().scrollingElement() == this) {
    1326         if (auto* frame = documentFrameWithNonNullView()) {
    1327             // FIXME: Should we use document()->scrollingElement()?
    1328             // See https://bugs.webkit.org/show_bug.cgi?id=205059
    1329             bool animated = document().documentElement() && useSmoothScrolling(ScrollBehavior::Auto, *document().documentElement());
    1330             frame->view()->setScrollPosition(IntPoint(frame->view()->scrollX(), static_cast<int>(newTop * frame->pageZoomFactor() * frame->frameScaleFactor())), animated);
    1331         }
     1316        if (auto* frame = documentFrameWithNonNullView())
     1317            frame->view()->setScrollPosition(IntPoint(frame->view()->scrollX(), static_cast<int>(newTop * frame->pageZoomFactor() * frame->frameScaleFactor())));
    13321318        return;
    13331319    }
    13341320
    13351321    if (auto* renderer = renderBox()) {
    1336         int clampedTop = clampToInteger(newTop * renderer->style().effectiveZoom());
    1337         bool animated = useSmoothScrolling(ScrollBehavior::Auto, *this);
    1338         renderer->setScrollTop(clampedTop, ScrollType::Programmatic, animated);
     1322        renderer->setScrollTop(static_cast<int>(newTop * renderer->style().effectiveZoom()), ScrollType::Programmatic);
    13391323        if (auto* scrollableArea = renderer->layer())
    13401324            scrollableArea->setScrollShouldClearLatchedState(true);

  • trunk/Source/WebCore/page/DOMWindow.cpp

    r254807 r254839  
    16511651void DOMWindow::scrollBy(double x, double y) const
    16521652{
    1653     scrollBy(ScrollToOptions(x, y));
     1653    scrollBy({ x, y });
    16541654}
    16551655
    … …  
    16731673void DOMWindow::scrollTo(double x, double y, ScrollClamping clamping) const
    16741674{
    1675     scrollTo(ScrollToOptions(x, y), clamping);
    1676 }
    1677 
    1678 void DOMWindow::scrollTo(const ScrollToOptions& options, ScrollClamping clamping) const
     1675    scrollTo({ x, y }, clamping);
     1676}
     1677
     1678void DOMWindow::scrollTo(const ScrollToOptions& options, ScrollClamping) const
    16791679{
    16801680    if (!isCurrentlyDisplayedInFrame())
    … …  
    16891689    );
    16901690
    1691     // This is an optimization for the common case of scrolling to (0, 0) when the scroller is already at the origin.
    1692     // If an animated scroll is in progress, this optimization is skipped to ensure that the animated scroll is really stopped.
    1693     if (view->currentScrollBehaviorStatus() == ScrollBehaviorStatus::NotInAnimation && !scrollToOptions.left.value() && !scrollToOptions.top.value() && view->contentsScrollPosition() == IntPoint(0, 0))
     1691    if (!scrollToOptions.left.value() && !scrollToOptions.top.value() && view->contentsScrollPosition() == IntPoint(0, 0))
    16941692        return;
    16951693
    … …  
    16971695
    16981696    IntPoint layoutPos(view->mapFromCSSToLayoutUnits(scrollToOptions.left.value()), view->mapFromCSSToLayoutUnits(scrollToOptions.top.value()));
    1699 
    1700     // FIXME: Should we use document()->scrollingElement()?
    1701     // See https://bugs.webkit.org/show_bug.cgi?id=205059
    1702     if (document()->documentElement() && useSmoothScrolling(scrollToOptions.behavior.valueOr(ScrollBehavior::Auto), *document()->documentElement())) {
    1703         view->scrollToOffsetWithAnimation(layoutPos, ScrollType::Programmatic, clamping);
    1704         return;
    1705     }
    1706 
    17071697    view->setContentsScrollPosition(layoutPos);
    17081698}

  • trunk/Source/WebCore/page/FrameView.cpp

    r254807 r254839  
    22802280}
    22812281
    2282 void FrameView::setScrollPosition(const ScrollPosition& scrollPosition, bool animated)
     2282void FrameView::setScrollPosition(const ScrollPosition& scrollPosition)
    22832283{
    22842284    LOG_WITH_STREAM(Scrolling, stream << "FrameView::setScrollPosition " << scrollPosition << " , clearing anchor");
    … …  
    22932293    if (page && page->isMonitoringWheelEvents())
    22942294        scrollAnimator().setWheelEventTestMonitor(page->wheelEventTestMonitor());
    2295     if (animated)
    2296         scrollToOffsetWithAnimation(scrollOffsetFromPosition(scrollPosition), currentScrollType());
    2297     else
    2298         ScrollView::setScrollPosition(scrollPosition);
     2295    ScrollView::setScrollPosition(scrollPosition);
    22992296
    23002297    setCurrentScrollType(oldScrollType);
    … …  
    36603657
    36613658    didChangeScrollOffset();
    3662 }
    3663 
    3664 void FrameView::scrollToOffsetWithAnimation(const ScrollOffset& offset, ScrollType scrollType, ScrollClamping)
    3665 {
    3666     auto previousScrollType = currentScrollType();
    3667     setCurrentScrollType(scrollType);
    3668 
    3669     if (currentScrollBehaviorStatus() == ScrollBehaviorStatus::InNonNativeAnimation)
    3670         scrollAnimator().cancelAnimations();
    3671     if (offset != this->scrollOffset())
    3672         ScrollableArea::scrollToOffsetWithAnimation(offset);
    3673     setCurrentScrollType(previousScrollType);
    36743659}
    36753660

  • trunk/Source/WebCore/page/FrameView.h

    r254807 r254839  
    224224    WEBCORE_EXPORT void setFixedVisibleContentRect(const IntRect&) final;
    225225#endif
    226     WEBCORE_EXPORT void setScrollPosition(const ScrollPosition&, bool animated = false) final;
     226    WEBCORE_EXPORT void setScrollPosition(const ScrollPosition&) final;
    227227    void restoreScrollbar();
    228228    void scheduleScrollToFocusedElement(SelectionRevealMode);
    … …  
    660660    void renderLayerDidScroll(const RenderLayer&);
    661661
    662     WEBCORE_EXPORT void scrollToOffsetWithAnimation(const ScrollOffset&, ScrollType = ScrollType::Programmatic, ScrollClamping = ScrollClamping::Clamped);
    663 
    664662protected:
    665663    bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect) final;

  • trunk/Source/WebCore/platform/ScrollAnimation.h

    r254807 r254839  
    3333class FloatPoint;
    3434class ScrollableArea;
    35 enum class ScrollClamping : uint8_t;
    3635
    3736class ScrollAnimation {
    … …  
    4039    virtual ~ScrollAnimation() { };
    4140    virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float /* step */, float /* multiplier */) { return true; };
    42     virtual void scroll(const FloatPoint&) { };
    4341    virtual void stop() = 0;
    4442    virtual void updateVisibleLengths() { };

  • trunk/Source/WebCore/platform/ScrollAnimationSmooth.cpp

    r254807 r254839  
    2929#include "ScrollAnimationSmooth.h"
    3030
     31#if ENABLE(SMOOTH_SCROLLING)
     32
    3133#include "FloatPoint.h"
    3234#include "ScrollableArea.h"
    … …  
    3739static const Seconds tickTime = 1_s / frameRate;
    3840static const Seconds minimumTimerInterval { 1_ms };
    39 static const double smoothFactorForProgrammaticScroll = 5;
    4041
    4142ScrollAnimationSmooth::ScrollAnimationSmooth(ScrollableArea& scrollableArea, const FloatPoint& position, WTF::Function<void (FloatPoint&&)>&& notifyPositionChangedFunction)
    … …  
    6768}
    6869
    69 void ScrollAnimationSmooth::scroll(const FloatPoint& position)
    70 {
    71     ScrollGranularity granularity = ScrollByPage;
    72     bool needToScroll = updatePerAxisData(m_horizontalData, granularity, position.x() - m_horizontalData.currentPosition, m_scrollableArea.minimumScrollPosition().x(), m_scrollableArea.maximumScrollPosition().x(), smoothFactorForProgrammaticScroll);
    73     needToScroll |=
    74         updatePerAxisData(m_verticalData, granularity, position.y() - m_verticalData.currentPosition, m_scrollableArea.minimumScrollPosition().y(), m_scrollableArea.maximumScrollPosition().y(), smoothFactorForProgrammaticScroll);
    75     if (needToScroll && !animationTimerActive()) {
    76         m_startTime = m_horizontalData.startTime;
    77         animationTimerFired();
    78     }
    79 };
    80 
    8170void ScrollAnimationSmooth::stop()
    8271{
    8372    m_animationTimer.stop();
    84     m_scrollableArea.setScrollBehaviorStatus(ScrollBehaviorStatus::NotInAnimation);
    8573}
    8674
    … …  
    260248}
    261249
    262 bool ScrollAnimationSmooth::updatePerAxisData(PerAxisData& data, ScrollGranularity granularity, float delta, float minScrollPosition, float maxScrollPosition, double smoothFactor)
     250bool ScrollAnimationSmooth::updatePerAxisData(PerAxisData& data, ScrollGranularity granularity, float delta, float minScrollPosition, float maxScrollPosition)
    263251{
    264252    if (!data.startTime || !delta || (delta < 0) != (data.desiredPosition - data.currentPosition < 0)) {
    … …  
    276264    Curve coastTimeCurve;
    277265    getAnimationParametersForGranularity(granularity, animationTime, repeatMinimumSustainTime, attackTime, releaseTime, coastTimeCurve, maximumCoastTime);
    278 
    279     animationTime *= smoothFactor;
    280     repeatMinimumSustainTime *= smoothFactor;
    281     attackTime *= smoothFactor;
    282     releaseTime *= smoothFactor;
    283     maximumCoastTime *= smoothFactor;
    284266
    285267    data.desiredPosition = newPosition;
    … …  
    411393    if (continueAnimation)
    412394        startNextTimer(std::max(minimumTimerInterval, deltaToNextFrame));
    413     else
    414         m_scrollableArea.setScrollBehaviorStatus(ScrollBehaviorStatus::NotInAnimation);
    415395
    416396    m_notifyPositionChangedFunction(FloatPoint(m_horizontalData.currentPosition, m_verticalData.currentPosition));
    … …  
    428408
    429409} // namespace WebCore
     410
     411#endif // ENABLE(SMOOTH_SCROLLING)

  • trunk/Source/WebCore/platform/ScrollAnimationSmooth.h

    r254807 r254839  
    2828#include "ScrollAnimation.h"
    2929
     30#if ENABLE(SMOOTH_SCROLLING)
     31
    3032#include "Timer.h"
    3133
    … …  
    3436class FloatPoint;
    3537class ScrollableArea;
    36 enum class ScrollClamping : uint8_t;
    3738
    3839class ScrollAnimationSmooth final: public ScrollAnimation {
    … …  
    5152private:
    5253    bool scroll(ScrollbarOrientation, ScrollGranularity, float step, float multiplier) override;
    53     void scroll(const FloatPoint&) override;
    5454    void stop() override;
    5555    void updateVisibleLengths() override;
    … …  
    9090    };
    9191
    92     bool updatePerAxisData(PerAxisData&, ScrollGranularity, float delta, float minScrollPosition, float maxScrollPosition, double smoothFactor = 1);
     92    bool updatePerAxisData(PerAxisData&, ScrollGranularity, float delta, float minScrollPosition, float maxScrollPosition);
    9393    bool animateScroll(PerAxisData&, MonotonicTime currentTime);
    9494
    … …  
    109109} // namespace WebCore
    110110
     111#endif // ENABLE(SMOOTH_SCROLLING)

  • trunk/Source/WebCore/platform/ScrollAnimator.cpp

    r254807 r254839  
    3636#include "LayoutSize.h"
    3737#include "PlatformWheelEvent.h"
    38 #include "ScrollAnimationSmooth.h"
    3938#include "ScrollableArea.h"
    4039#include <algorithm>
    … …  
    5453    , m_scrollController(*this)
    5554#endif
    56     , m_animationProgrammaticScroll(makeUnique<ScrollAnimationSmooth>(scrollableArea, m_currentPosition, [this](FloatPoint&& position) {
    57         auto previousScrollType = m_scrollableArea.currentScrollType();
    58         m_scrollableArea.setCurrentScrollType(ScrollType::Programmatic);
    59         bool updated = m_scrollableArea.requestScrollPositionUpdate(roundedIntPoint(position));
    60         m_scrollableArea.setCurrentScrollType(previousScrollType);
    61         if (updated)
    62             return;
    63 
    64         FloatSize delta = position - m_currentPosition;
    65         m_currentPosition = WTFMove(position);
    66         notifyPositionChanged(delta);
    67     }))
    6855{
    6956}
    … …  
    8774    notifyPositionChanged(newPosition - currentPosition);
    8875    return true;
    89 }
    90 
    91 void ScrollAnimator::scrollToOffset(const FloatPoint& offset)
    92 {
    93     m_animationProgrammaticScroll->setCurrentPosition(m_currentPosition);
    94     auto newPosition = ScrollableArea::scrollPositionFromOffset(offset, toFloatSize(m_scrollableArea.scrollOrigin()));
    95     m_animationProgrammaticScroll->scroll(newPosition);
    96     m_scrollableArea.setScrollBehaviorStatus(ScrollBehaviorStatus::InNonNativeAnimation);
    9776}
    9877
    … …  
    267246#endif
    268247
    269 void ScrollAnimator::cancelAnimations()
    270 {
    271 #if !USE(REQUEST_ANIMATION_FRAME_TIMER)
    272     m_animationProgrammaticScroll->stop();
    273 #endif
    274 }
    275 
    276 void ScrollAnimator::serviceScrollAnimations()
    277 {
    278 #if !USE(REQUEST_ANIMATION_FRAME_TIMER)
    279     m_animationProgrammaticScroll->serviceAnimation();
    280 #endif
    281 }
    282 
    283 void ScrollAnimator::willEndLiveResize()
    284 {
    285     m_animationProgrammaticScroll->updateVisibleLengths();
    286 }
    287 
    288 void ScrollAnimator::didAddVerticalScrollbar(Scrollbar*)
    289 {
    290     m_animationProgrammaticScroll->updateVisibleLengths();
    291 }
    292 
    293 void ScrollAnimator::didAddHorizontalScrollbar(Scrollbar*)
    294 {
    295     m_animationProgrammaticScroll->updateVisibleLengths();
    296 }
    297 
    298248} // namespace WebCore

  • trunk/Source/WebCore/platform/ScrollAnimator.h

    r254807 r254839  
    4747class FloatPoint;
    4848class PlatformTouchEvent;
    49 class ScrollAnimation;
    5049class ScrollableArea;
    5150class Scrollbar;
    … …  
    7069    virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, float multiplier);
    7170
    72     void scrollToOffset(const FloatPoint&);
    7371    virtual void scrollToOffsetWithoutAnimation(const FloatPoint&, ScrollClamping = ScrollClamping::Clamped);
    7472
    … …  
    8886    const FloatPoint& currentPosition() const { return m_currentPosition; }
    8987
    90     virtual void cancelAnimations();
    91     virtual void serviceScrollAnimations();
     88    virtual void cancelAnimations() { }
     89    virtual void serviceScrollAnimations() { }
    9290
    9391    virtual void contentAreaWillPaint() const { }
    … …  
    10098    virtual void willStartLiveResize() { }
    10199    virtual void contentsResized() const { }
    102     virtual void willEndLiveResize();
     100    virtual void willEndLiveResize() { }
    103101    virtual void contentAreaDidShow() { }
    104102    virtual void contentAreaDidHide() { }
    … …  
    107105    virtual bool scrollbarsCanBeActive() const { return true; }
    108106
    109     virtual void didAddVerticalScrollbar(Scrollbar*);
     107    virtual void didAddVerticalScrollbar(Scrollbar*) { }
    110108    virtual void willRemoveVerticalScrollbar(Scrollbar*) { }
    111     virtual void didAddHorizontalScrollbar(Scrollbar*);
     109    virtual void didAddHorizontalScrollbar(Scrollbar*) { }
    112110    virtual void willRemoveHorizontalScrollbar(Scrollbar*) { }
    113111
    … …  
    154152#endif
    155153    FloatPoint m_currentPosition;
    156 
    157     std::unique_ptr<ScrollAnimation> m_animationProgrammaticScroll;
    158154};
    159155

  • trunk/Source/WebCore/platform/ScrollTypes.h

    r254807 r254839  
    5555};
    5656
    57 // FIXME: Add another status InNativeAnimation to indicate native scrolling is in progress.
    58 // See: https://bugs.webkit.org/show_bug.cgi?id=204936
    59 enum class ScrollBehaviorStatus : uint8_t {
    60     NotInAnimation,
    61     InNonNativeAnimation,
    62 };
    63 
    6457inline ScrollDirection logicalToPhysical(ScrollLogicalDirection direction, bool isVertical, bool isFlipped)
    6558{

  • trunk/Source/WebCore/platform/ScrollView.cpp

    r254807 r254839  
    519519}
    520520
    521 void ScrollView::setScrollPosition(const ScrollPosition& scrollPosition, bool/* animated*/)
     521void ScrollView::setScrollPosition(const ScrollPosition& scrollPosition)
    522522{
    523523    LOG_WITH_STREAM(Scrolling, stream << "ScrollView::setScrollPosition " << scrollPosition);
    … …  
    533533    ScrollPosition newScrollPosition = !delegatesScrolling() ? adjustScrollPositionWithinRange(scrollPosition) : scrollPosition;
    534534
    535     if ((!delegatesScrolling() || currentScrollType() == ScrollType::User) && currentScrollBehaviorStatus() == ScrollBehaviorStatus::NotInAnimation && newScrollPosition == this->scrollPosition())
    536         return;
    537 
    538     if (currentScrollBehaviorStatus() == ScrollBehaviorStatus::InNonNativeAnimation)
    539         scrollAnimator().cancelAnimations();
    540 
    541     if (requestScrollPositionUpdate(newScrollPosition)) {
    542         setScrollBehaviorStatus(ScrollBehaviorStatus::NotInAnimation);
    543         return;
    544     }
     535    if ((!delegatesScrolling() || currentScrollType() == ScrollType::User) && newScrollPosition == this->scrollPosition())
     536        return;
     537
     538    if (requestScrollPositionUpdate(newScrollPosition))
     539        return;
    545540
    546541    updateScrollbars(newScrollPosition);
    547     setScrollBehaviorStatus(ScrollBehaviorStatus::NotInAnimation);
    548542}
    549543
    … …  
    602596    if (!managesScrollbars()) {
    603597        if (scrollOriginChanged()) {
    604             if (!requestScrollPositionUpdate(desiredPosition))
    605                 ScrollableArea::scrollToOffsetWithoutAnimation(scrollOffsetFromPosition(desiredPosition));
     598            ScrollableArea::scrollToOffsetWithoutAnimation(scrollOffsetFromPosition(desiredPosition));
    606599            resetScrollOriginChanged();
    607600        }

  • trunk/Source/WebCore/platform/ScrollView.h

    r254807 r254839  
    265265
    266266    // Functions for scrolling the view.
    267     virtual void setScrollPosition(const ScrollPosition&, bool animated = false);
     267    virtual void setScrollPosition(const ScrollPosition&);
    268268    void scrollBy(const IntSize& s) { return setScrollPosition(scrollPosition() + s); }
    269269

  • trunk/Source/WebCore/platform/ScrollableArea.cpp

    r254807 r254839  
    143143}
    144144
    145 void ScrollableArea::scrollToOffsetWithAnimation(const FloatPoint& offset, ScrollClamping)
    146 {
    147     LOG_WITH_STREAM(Scrolling, stream << "ScrollableArea " << this << " scrollToOffsetWithAnimation " << offset);
    148     scrollAnimator().scrollToOffset(offset);
    149 }
    150 
    151145void ScrollableArea::scrollToOffsetWithoutAnimation(const FloatPoint& offset, ScrollClamping clamping)
    152146{
    … …  
    228222void ScrollableArea::setScrollOffsetFromInternals(const ScrollOffset& offset)
    229223{
    230     if (requestScrollPositionUpdate(scrollPositionFromOffset(offset)))
     224    setScrollOffsetFromAnimation(offset);
     225}
     226
     227void ScrollableArea::setScrollOffsetFromAnimation(const ScrollOffset& offset)
     228{
     229    ScrollPosition position = scrollPositionFromOffset(offset);
     230    if (requestScrollPositionUpdate(position))
    231231        return;
    232232
    233     setScrollOffsetFromAnimation(offset);
    234 }
    235 
    236 void ScrollableArea::setScrollOffsetFromAnimation(const ScrollOffset& offset)
    237 {
    238     scrollPositionChanged(scrollPositionFromOffset(offset));
     233    scrollPositionChanged(position);
    239234}
    240235

  • trunk/Source/WebCore/platform/ScrollableArea.h

    r254807 r254839  
    6363class ScrollableArea : public CanMakeWeakPtr<ScrollableArea> {
    6464public:
    65     ScrollBehaviorStatus currentScrollBehaviorStatus() { return m_currentScrollBehaviorStatus; }
    66     void setScrollBehaviorStatus(ScrollBehaviorStatus status) { m_currentScrollBehaviorStatus = status; }
    67 
    6865    WEBCORE_EXPORT bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1);
    69     WEBCORE_EXPORT void scrollToOffsetWithAnimation(const FloatPoint&, ScrollClamping = ScrollClamping::Clamped);
    7066    WEBCORE_EXPORT void scrollToOffsetWithoutAnimation(const FloatPoint&, ScrollClamping = ScrollClamping::Clamped);
    7167    void scrollToOffsetWithoutAnimation(ScrollbarOrientation, float offset);
    … …  
    384380#endif
    385381
    386     ScrollBehaviorStatus m_currentScrollBehaviorStatus { ScrollBehaviorStatus::NotInAnimation };
    387 
    388382    // There are 8 possible combinations of writing mode and direction. Scroll origin will be non-zero in the x or y axis
    389383    // if there is any reversed direction or writing-mode. The combinations are:

  • trunk/Source/WebCore/platform/generic/ScrollAnimatorGeneric.cpp

    r254807 r254839  
    163163void ScrollAnimatorGeneric::updatePosition(FloatPoint&& position)
    164164{
    165     if (m_scrollableArea.requestScrollPositionUpdate(roundedIntPoint(position)))
    166         return;
    167165    FloatSize delta = position - m_currentPosition;
    168166    m_currentPosition = WTFMove(position);

  • trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp

    r254817 r254839  
    5050#include <wtf/text/TextStream.h>
    5151
    52 #if PLATFORM(COCOA)
    53 #import <pal/spi/cg/CoreGraphicsSPI.h>
    54 #else
     52#if !PLATFORM(COCOA)
    5553#include "ImageSourceCG.h"
    5654#endif

  • trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm

    r254807 r254839  
    11571157void ScrollAnimatorMac::cancelAnimations()
    11581158{
    1159     ScrollAnimator::cancelAnimations();
    11601159    m_haveScrolledSincePageLoad = false;
    11611160

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r254807 r254839  
    582582}
    583583
    584 void RenderBox::setScrollLeft(int newLeft, ScrollType scrollType, bool animated, ScrollClamping clamping)
     584void RenderBox::setScrollLeft(int newLeft, ScrollType scrollType, ScrollClamping clamping)
    585585{
    586586    if (!hasOverflowClip() || !layer())
    587587        return;
    588588    setupWheelEventMonitor(*layer());
    589     layer()->scrollToXPosition(newLeft, scrollType, animated, clamping);
    590 }
    591 
    592 void RenderBox::setScrollTop(int newTop, ScrollType scrollType, bool animated, ScrollClamping clamping)
     589    layer()->scrollToXPosition(newLeft, scrollType, clamping);
     590}
     591
     592void RenderBox::setScrollTop(int newTop, ScrollType scrollType, ScrollClamping clamping)
    593593{
    594594    if (!hasOverflowClip() || !layer())
    595595        return;
    596596    setupWheelEventMonitor(*layer());
    597     layer()->scrollToYPosition(newTop, scrollType, animated, clamping);
    598 }
    599 
    600 void RenderBox::setScrollPosition(const ScrollPosition& position, ScrollType scrollType, bool animated, ScrollClamping clamping)
    601 {
    602     if (!hasOverflowClip() || !layer())
    603         return;
    604     setupWheelEventMonitor(*layer());
    605     layer()->scrollToPosition(position, scrollType, animated, clamping);
     597    layer()->scrollToYPosition(newTop, scrollType, clamping);
    606598}
    607599

  • trunk/Source/WebCore/rendering/RenderBox.h

    r254807 r254839  
    248248    virtual int scrollWidth() const;
    249249    virtual int scrollHeight() const;
    250     virtual void setScrollLeft(int, ScrollType, bool animated = false, ScrollClamping = ScrollClamping::Clamped);
    251     virtual void setScrollTop(int, ScrollType, bool animated = false, ScrollClamping = ScrollClamping::Clamped);
    252     void setScrollPosition(const ScrollPosition&, ScrollType, bool animated = false, ScrollClamping = ScrollClamping::Clamped);
     250    virtual void setScrollLeft(int, ScrollType, ScrollClamping = ScrollClamping::Clamped);
     251    virtual void setScrollTop(int, ScrollType, ScrollClamping = ScrollClamping::Clamped);
    253252
    254253    LayoutUnit marginTop() const override { return m_marginBox.top(); }

  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r254807 r254839  
    25802580}
    25812581
    2582 void RenderLayer::scrollToXPosition(int x, ScrollType scrollType, bool animated, ScrollClamping clamping)
     2582void RenderLayer::scrollToXPosition(int x, ScrollType scrollType, ScrollClamping clamping)
    25832583{
    25842584    ScrollPosition position(x, m_scrollPosition.y());
    2585     scrollToPosition(position, scrollType, animated, clamping);
    2586 }
    2587 
    2588 void RenderLayer::scrollToYPosition(int y, ScrollType scrollType, bool animated, ScrollClamping clamping)
     2585    scrollToOffset(scrollOffsetFromPosition(position), scrollType, clamping);
     2586}
     2587
     2588void RenderLayer::scrollToYPosition(int y, ScrollType scrollType, ScrollClamping clamping)
    25892589{
    25902590    ScrollPosition position(m_scrollPosition.x(), y);
    2591     scrollToPosition(position, scrollType, animated, clamping);
    2592 }
    2593 
    2594 void RenderLayer::scrollToPosition(const ScrollPosition& position, ScrollType scrollType, bool animated, ScrollClamping clamping)
    2595 {
    2596     if (animated)
    2597         scrollToOffsetWithAnimation(scrollOffsetFromPosition(position), scrollType, clamping);
    2598     else
    2599         scrollToOffset(scrollOffsetFromPosition(position), scrollType, clamping);
     2591    scrollToOffset(scrollOffsetFromPosition(position), scrollType, clamping);
    26002592}
    26012593
    … …  
    26072599void RenderLayer::scrollToOffset(const ScrollOffset& scrollOffset, ScrollType scrollType, ScrollClamping clamping)
    26082600{
    2609     if (currentScrollBehaviorStatus() == ScrollBehaviorStatus::InNonNativeAnimation)
    2610         scrollAnimator().cancelAnimations();
    2611 
    26122601    ScrollOffset clampedScrollOffset = clamping == ScrollClamping::Clamped ? clampScrollOffset(scrollOffset) : scrollOffset;
    26132602    if (clampedScrollOffset == this->scrollOffset())
    … …  
    26192608    bool handled = false;
    26202609#if ENABLE(ASYNC_SCROLLING)
    2621     handled = requestScrollPositionUpdate(scrollPositionFromOffset(clampedScrollOffset));
     2610    if (ScrollingCoordinator* scrollingCoordinator = page().scrollingCoordinator())
     2611        handled = scrollingCoordinator->requestScrollPositionUpdate(*this, scrollPositionFromOffset(clampedScrollOffset));
    26222612#endif
    26232613
    26242614    if (!handled)
    26252615        scrollToOffsetWithoutAnimation(clampedScrollOffset, clamping);
    2626     setScrollBehaviorStatus(ScrollBehaviorStatus::NotInAnimation);
    2627 
    2628     setCurrentScrollType(previousScrollType);
    2629 }
    2630 
    2631 bool RenderLayer::requestScrollPositionUpdate(const ScrollPosition& position)
    2632 {
    2633 #if ENABLE(ASYNC_SCROLLING)
    2634     if (ScrollingCoordinator* scrollingCoordinator = page().scrollingCoordinator())
    2635         return scrollingCoordinator->requestScrollPositionUpdate(*this, position);
    2636 #endif
    2637     return false;
    2638 }
    2639 
    2640 void RenderLayer::scrollToOffsetWithAnimation(const ScrollOffset& offset, ScrollType scrollType, ScrollClamping clamping)
    2641 {
    2642     auto previousScrollType = currentScrollType();
    2643     setCurrentScrollType(scrollType);
    2644 
    2645     ScrollOffset newScrollOffset = clamping == ScrollClamping::Clamped ? clampScrollOffset(offset) : offset;
    2646     if (currentScrollBehaviorStatus() == ScrollBehaviorStatus::InNonNativeAnimation)
    2647         scrollAnimator().cancelAnimations();
    2648     if (newScrollOffset != this->scrollOffset())
    2649         ScrollableArea::scrollToOffsetWithAnimation(newScrollOffset);
     2616
    26502617    setCurrentScrollType(previousScrollType);
    26512618}
    … …  
    26832650    }
    26842651   
    2685     if (m_scrollPosition == newPosition && currentScrollBehaviorStatus() == ScrollBehaviorStatus::NotInAnimation) {
     2652    if (m_scrollPosition == newPosition) {
    26862653        // FIXME: Nothing guarantees we get a scrollTo() with an unchanged position at the end of a user gesture.
    26872654        // The ScrollingCoordinator probably needs to message the main thread when a gesture ends.
    … …  
    28282795
    28292796        ScrollOffset clampedScrollOffset = clampScrollOffset(scrollOffset() + toIntSize(roundedIntRect(revealRect).location()));
    2830         if (currentScrollBehaviorStatus() != ScrollBehaviorStatus::NotInAnimation || clampedScrollOffset != scrollOffset()) {
     2797        if (clampedScrollOffset != scrollOffset()) {
    28312798            ScrollOffset oldScrollOffset = scrollOffset();
    2832             bool animated = (box->element() && useSmoothScrolling(options.behavior, *box->element()));
    2833             scrollToPosition(scrollPositionFromOffset(clampedScrollOffset), ScrollType::Programmatic, animated);
    2834             IntSize scrollOffsetDifference = clampedScrollOffset - oldScrollOffset;
     2799            scrollToOffset(clampedScrollOffset);
     2800            IntSize scrollOffsetDifference = scrollOffset() - oldScrollOffset;
    28352801            localExposeRect.move(-scrollOffsetDifference);
    28362802            newRect = LayoutRect(box->localToAbsoluteQuad(FloatQuad(FloatRect(localExposeRect)), UseTransforms).boundingBox());
    … …  
    28522818                LayoutRect exposeRect = getRectToExpose(viewRect, absoluteRect, insideFixed, options.alignX, options.alignY);
    28532819
    2854                 IntPoint scrollPosition(roundedIntPoint(exposeRect.location()));
     2820                IntPoint scrollOffset(roundedIntPoint(exposeRect.location()));
    28552821                // Adjust offsets if they're outside of the allowable range.
    2856                 scrollPosition = scrollPosition.constrainedBetween(IntPoint(), IntPoint(frameView.contentsSize()));
    2857                 // FIXME: Should we use contentDocument()->scrollingElement()?
    2858                 // See https://bugs.webkit.org/show_bug.cgi?id=205059
    2859                 bool animated = ownerElement->contentDocument() && ownerElement->contentDocument()->documentElement() && useSmoothScrolling(options.behavior, *ownerElement->contentDocument()->documentElement());
    2860                 frameView.setScrollPosition(scrollPosition, animated);
     2822                scrollOffset = scrollOffset.constrainedBetween(IntPoint(), IntPoint(frameView.contentsSize()));
     2823                frameView.setScrollPosition(scrollOffset);
    28612824
    28622825                if (options.shouldAllowCrossOriginScrolling == ShouldAllowCrossOriginScrolling::Yes || frameView.safeToPropagateScrollToParent()) {
    … …  
    28972860            if (revealRect != viewRect) {
    28982861                ScrollOffset clampedScrollPosition = roundedIntPoint(revealRect.location()).constrainedBetween(minScrollPosition, maxScrollPosition);
    2899                 // FIXME: Should we use document()->scrollingElement()?
    2900                 // See https://bugs.webkit.org/show_bug.cgi?id=205059
    2901                 bool animated = renderer().document().documentElement() && useSmoothScrolling(options.behavior, *renderer().document().documentElement());
    2902                 frameView.setScrollPosition(clampedScrollPosition, animated);
     2862                frameView.setScrollPosition(clampedScrollPosition);
    29032863            }
    29042864

  • trunk/Source/WebCore/rendering/RenderLayer.h

    r254807 r254839  
    5151#include "RenderBox.h"
    5252#include "RenderPtr.h"
    53 #include "ScrollBehavior.h"
    5453#include "ScrollableArea.h"
    5554#include <memory>
    … …  
    136135    const ScrollAlignment& alignY { ScrollAlignment::alignCenterIfNeeded };
    137136    ShouldAllowCrossOriginScrolling shouldAllowCrossOriginScrolling { ShouldAllowCrossOriginScrolling::No };
    138     ScrollBehavior behavior { ScrollBehavior::Auto };
    139137};
    140138
    … …  
    443441
    444442    WEBCORE_EXPORT void scrollToOffset(const ScrollOffset&, ScrollType = ScrollType::Programmatic, ScrollClamping = ScrollClamping::Clamped);
    445     WEBCORE_EXPORT void scrollToOffsetWithAnimation(const ScrollOffset&, ScrollType = ScrollType::Programmatic, ScrollClamping = ScrollClamping::Clamped);
    446 
    447     bool requestScrollPositionUpdate(const ScrollPosition&) override;
    448 
    449     void scrollToXPosition(int x, ScrollType, bool animated, ScrollClamping = ScrollClamping::Clamped);
    450     void scrollToYPosition(int y, ScrollType, bool animated, ScrollClamping = ScrollClamping::Clamped);
    451     void scrollToPosition(const ScrollPosition&, ScrollType, bool animated, ScrollClamping = ScrollClamping::Clamped);
     443
     444    void scrollToXPosition(int x, ScrollType, ScrollClamping = ScrollClamping::Clamped);
     445    void scrollToYPosition(int y, ScrollType, ScrollClamping = ScrollClamping::Clamped);
    452446
    453447    // These are only used by marquee.

  • trunk/Source/WebCore/rendering/RenderListBox.cpp

    r254807 r254839  
    744744}
    745745
    746 void RenderListBox::setScrollLeft(int, ScrollType, bool, ScrollClamping)
     746void RenderListBox::setScrollLeft(int, ScrollType, ScrollClamping)
    747747{
    748748}
    … …  
    761761}
    762762
    763 void RenderListBox::setScrollTop(int newTop, ScrollType, bool, ScrollClamping)
     763void RenderListBox::setScrollTop(int newTop, ScrollType, ScrollClamping)
    764764{
    765765    // Determine an index and scroll to it.   

  • trunk/Source/WebCore/rendering/RenderListBox.h

    r254807 r254839  
    107107    int scrollWidth() const override;
    108108    int scrollHeight() const override;
    109     void setScrollLeft(int, ScrollType, bool, ScrollClamping) override;
    110     void setScrollTop(int, ScrollType, bool, ScrollClamping) override;
     109    void setScrollLeft(int, ScrollType, ScrollClamping) override;
     110    void setScrollTop(int, ScrollType, ScrollClamping) override;
    111111
    112112    bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;

  • trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

    r254807 r254839  
    377377}
    378378
    379 void RenderTextControlSingleLine::setScrollLeft(int newLeft, ScrollType, bool, ScrollClamping)
     379void RenderTextControlSingleLine::setScrollLeft(int newLeft, ScrollType, ScrollClamping)
    380380{
    381381    if (innerTextElement())
    … …  
    383383}
    384384
    385 void RenderTextControlSingleLine::setScrollTop(int newTop, ScrollType, bool, ScrollClamping)
     385void RenderTextControlSingleLine::setScrollTop(int newTop, ScrollType, ScrollClamping)
    386386{
    387387    if (innerTextElement())

  • trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h

    r254807 r254839  
    5858    int scrollWidth() const override;
    5959    int scrollHeight() const override;
    60     void setScrollLeft(int, ScrollType, bool, ScrollClamping) override;
    61     void setScrollTop(int, ScrollType, bool, ScrollClamping) override;
     60    void setScrollLeft(int, ScrollType, ScrollClamping) override;
     61    void setScrollTop(int, ScrollType, ScrollClamping) override;
    6262    bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint()) final;
    6363    bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0) final;

  • trunk/Source/WebCore/testing/Internals.cpp

    r254807 r254839  
    17631763        return Exception { InvalidAccessError };
    17641764
    1765     element.scrollTo(ScrollToOptions(x, y), ScrollClamping::Unclamped);
     1765    element.scrollTo({ x, y }, ScrollClamping::Unclamped);
    17661766    return { };
    17671767}
Note: See TracChangeset for help on using the changeset viewer.