Changeset 234642 in webkit

Timestamp:

Aug 7, 2018 1:30:39 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Make DOMWindow::scrollBy rely on DOMWindow::scrollTo
​https://bugs.webkit.org/show_bug.cgi?id=188343

Patch by Frederic Wang <​fwang@igalia.com> on 2018-08-07
Reviewed by Darin Adler.

This patch makes DOMWindow::scrollBy rely on DOMWindow::scrollTo in order to perform actual
scrolling of the view. In particular, this reduces the number of code path to modify in order
to implement the ScrollBehavior option (bug 188043). The only change is an optimization when
scrolling to position (0, 0) but it is not observable.

No new tests, behavior unchanged and already tested.

• page/DOMWindow.cpp:

(WebCore::DOMWindow::scrollBy const): Add the current view position to the scrollBy offset in
order to obtain the scrollTo offset.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DOMWindow.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-08-07  Frederic Wang  <fwang@igalia.com>
+
+        Make DOMWindow::scrollBy rely on DOMWindow::scrollTo
+        https://bugs.webkit.org/show_bug.cgi?id=188343
+
+        Reviewed by Darin Adler.
+
+        This patch makes DOMWindow::scrollBy rely on DOMWindow::scrollTo in order to perform actual
+        scrolling of the view. In particular, this reduces the number of code path to modify in order
+        to implement the ScrollBehavior option (bug 188043). The only change is an optimization when
+        scrolling to position (0, 0) but it is not observable.
+
+        No new tests, behavior unchanged and already tested.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::scrollBy const): Add the current view position to the scrollBy offset in
+        order to obtain the scrollTo offset.
+
 2018-08-04  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1592 +1592 @@
 
     ScrollToOptions scrollToOptions = normalizeNonFiniteCoordinatesOrFallBackTo(options, 0, 0);
-    IntSize scaledOffset(view->mapFromCSSToLayoutUnits(scrollToOptions.left.value()), view->mapFromCSSToLayoutUnits(scrollToOptions.top.value()));
-    view->setContentsScrollPosition(view->contentsScrollPosition() + scaledOffset);
+    scrollToOptions.left.value() += view->mapFromLayoutToCSSUnits(view->contentsScrollPosition().x());
+    scrollToOptions.top.value() += view->mapFromLayoutToCSSUnits(view->contentsScrollPosition().y());
+    scrollTo(scrollToOptions);
 }