Changeset 245832 in webkit

Timestamp:

May 28, 2019, 4:57:27 PM (7 years ago)

Author:

timothy_horton@apple.com

Message:

Horizontal scrollbar flashes after scrolling vertically with keyboard
​https://bugs.webkit.org/show_bug.cgi?id=197942
<rdar://problem/46169578>

Reviewed by Dean Jackson.

• UIProcess/ios/WKKeyboardScrollingAnimator.mm:

(axesForDelta):
(-[WKKeyboardScrollViewAnimator scrollToContentOffset:animated:]):
Only flash relevant axes.

• Platform/spi/ios/UIKitSPI.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (2 diffs)
• UIProcess/ios/WKKeyboardScrollingAnimator.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-28  Tim Horton  <timothy_horton@apple.com>
+
+        Horizontal scrollbar flashes after scrolling vertically with keyboard
+        https://bugs.webkit.org/show_bug.cgi?id=197942
+        <rdar://problem/46169578>
+
+        Reviewed by Dean Jackson.
+
+        * UIProcess/ios/WKKeyboardScrollingAnimator.mm:
+        (axesForDelta):
+        (-[WKKeyboardScrollViewAnimator scrollToContentOffset:animated:]):
+        Only flash relevant axes.
+
+        * Platform/spi/ios/UIKitSPI.h:
+
 2019-05-28  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h

@@ -339 +339 @@
 };
 
+typedef enum {
+    UIAxisNeither = 0,
+    UIAxisHorizontal = 1 << 0,
+    UIAxisVertical = 1 << 1,
+    UIAxisBoth = (UIAxisHorizontal | UIAxisVertical),
+} UIAxis;
+
 @interface UIScrollView ()
 - (void)_stopScrollingAndZoomingAnimations;
@@ -345 +352 @@
 - (double)_horizontalVelocity;
 - (double)_verticalVelocity;
-- (void)_flashScrollIndicatorsPersistingPreviousFlashes;
+- (void)_flashScrollIndicatorsForAxes:(UIAxis)axes persistingPreviousFlashes:(BOOL)persisting;
 @property (nonatomic, getter=isZoomEnabled) BOOL zoomEnabled;
 @property (nonatomic, readonly, getter=_isAnimatingZoom) BOOL isAnimatingZoom;

trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm

@@ -590 +590 @@
 }
 
-- (void)scrollToContentOffset:(WebCore::FloatPoint)contentOffsetDelta animated:(BOOL)animated
+#if HAVE(UI_SCROLL_VIEW_INDICATOR_FLASHING_SPI)
+static UIAxis axesForDelta(WebCore::FloatSize delta)
+{
+    UIAxis axes = UIAxisNeither;
+    if (delta.width())
+        axes = static_cast<UIAxis>(axes | UIAxisHorizontal);
+    if (delta.height())
+        axes = static_cast<UIAxis>(axes | UIAxisVertical);
+    return axes;
+}
+#endif
+
+- (void)scrollToContentOffset:(WebCore::FloatPoint)contentOffset animated:(BOOL)animated
 {
     auto scrollView = _scrollView.getAutoreleased();
@@ -597 +609 @@
     if (_delegateRespondsToWillScroll)
         [_delegate keyboardScrollViewAnimatorWillScroll:self];
-    [scrollView setContentOffset:contentOffsetDelta animated:animated];
+    [scrollView setContentOffset:contentOffset animated:animated];
 #if HAVE(UI_SCROLL_VIEW_INDICATOR_FLASHING_SPI)
-    [scrollView _flashScrollIndicatorsPersistingPreviousFlashes];
+    [scrollView _flashScrollIndicatorsForAxes:axesForDelta(WebCore::FloatPoint(scrollView.contentOffset) - contentOffset) persistingPreviousFlashes:YES];
 #else
     [scrollView _flashScrollIndicatorsPersistingPreviousFlashes:YES];