Title: [261436] trunk/Source
Revision
261436
Author
[email protected]
Date
2020-05-09 09:02:26 -0700 (Sat, 09 May 2020)

Log Message

Remove HAVE_UI_SCROLL_VIEW_INDICATOR_FLASHING_SPI
https://bugs.webkit.org/show_bug.cgi?id=211662
rdar://problem/63048713

Reviewed by Darin Adler.

Source/WebKit:

Remove this platform conditional and unconditionally use -[UIScrolView _flashScrollIndicatorsForAxes:
persistingPreviousFlashes:]. All supported platforms with UIScrollView have this SPI, and the conditional
was excluding Mac Catalyst, making WKKeyboardScrollViewAnimator send a message to its scroll view that
is no longer implemented.

* Platform/spi/ios/UIKitSPI.h:
    Remove the declaration of the now unused -_flashScrollIndicatorsPersistingPreviousFlashes:.
* UIProcess/ios/WKKeyboardScrollingAnimator.mm:
(axesForDelta):
(-[WKKeyboardScrollViewAnimator scrollToContentOffset:animated:]):

Source/WTF:

* wtf/PlatformHave.h:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (261435 => 261436)


--- trunk/Source/WTF/ChangeLog	2020-05-09 11:10:51 UTC (rev 261435)
+++ trunk/Source/WTF/ChangeLog	2020-05-09 16:02:26 UTC (rev 261436)
@@ -1,3 +1,13 @@
+2020-05-09  David Quesada  <[email protected]>
+
+        Remove HAVE_UI_SCROLL_VIEW_INDICATOR_FLASHING_SPI
+        https://bugs.webkit.org/show_bug.cgi?id=211662
+        rdar://problem/63048713
+
+        Reviewed by Darin Adler.
+
+        * wtf/PlatformHave.h:
+
 2020-05-08  Basuke Suzuki  <[email protected]>
 
         [WTF] Share Linux's MemoryPressureHandler among other Unix ports

Modified: trunk/Source/WTF/wtf/PlatformHave.h (261435 => 261436)


--- trunk/Source/WTF/wtf/PlatformHave.h	2020-05-09 11:10:51 UTC (rev 261435)
+++ trunk/Source/WTF/wtf/PlatformHave.h	2020-05-09 16:02:26 UTC (rev 261436)
@@ -464,10 +464,6 @@
 #endif
 
 #if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
-#define HAVE_UI_SCROLL_VIEW_INDICATOR_FLASHING_SPI 1
-#endif
-
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
 #define HAVE_APP_LINKS_WITH_ISENABLED 1
 #endif
 

Modified: trunk/Source/WebKit/ChangeLog (261435 => 261436)


--- trunk/Source/WebKit/ChangeLog	2020-05-09 11:10:51 UTC (rev 261435)
+++ trunk/Source/WebKit/ChangeLog	2020-05-09 16:02:26 UTC (rev 261436)
@@ -1,3 +1,22 @@
+2020-05-09  David Quesada  <[email protected]>
+
+        Remove HAVE_UI_SCROLL_VIEW_INDICATOR_FLASHING_SPI
+        https://bugs.webkit.org/show_bug.cgi?id=211662
+        rdar://problem/63048713
+
+        Reviewed by Darin Adler.
+
+        Remove this platform conditional and unconditionally use -[UIScrolView _flashScrollIndicatorsForAxes:
+        persistingPreviousFlashes:]. All supported platforms with UIScrollView have this SPI, and the conditional
+        was excluding Mac Catalyst, making WKKeyboardScrollViewAnimator send a message to its scroll view that
+        is no longer implemented.
+
+        * Platform/spi/ios/UIKitSPI.h:
+            Remove the declaration of the now unused -_flashScrollIndicatorsPersistingPreviousFlashes:.
+        * UIProcess/ios/WKKeyboardScrollingAnimator.mm:
+        (axesForDelta):
+        (-[WKKeyboardScrollViewAnimator scrollToContentOffset:animated:]):
+
 2020-05-08  David Kilzer  <[email protected]>
 
         Remove empty directories from from svn.webkit.org repository

Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (261435 => 261436)


--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h	2020-05-09 11:10:51 UTC (rev 261435)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h	2020-05-09 16:02:26 UTC (rev 261436)
@@ -1306,7 +1306,6 @@
 - (BOOL)_canScrollWithoutBouncingY;
 - (void)_setContentOffsetWithDecelerationAnimation:(CGPoint)contentOffset;
 - (CGPoint)_adjustedContentOffsetForContentOffset:(CGPoint)contentOffset;
-- (void)_flashScrollIndicatorsPersistingPreviousFlashes:(BOOL)persisting;
 
 @property (nonatomic) BOOL tracksImmediatelyWhileDecelerating;
 @property (nonatomic, getter=_avoidsJumpOnInterruptedBounce, setter=_setAvoidsJumpOnInterruptedBounce:) BOOL _avoidsJumpOnInterruptedBounce;

Modified: trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm (261435 => 261436)


--- trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm	2020-05-09 11:10:51 UTC (rev 261435)
+++ trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm	2020-05-09 16:02:26 UTC (rev 261436)
@@ -593,7 +593,6 @@
     return [_delegate keyboardScrollViewAnimator:self distanceForIncrement:increment inDirection:direction];
 }
 
-#if HAVE(UI_SCROLL_VIEW_INDICATOR_FLASHING_SPI)
 static UIAxis axesForDelta(WebCore::FloatSize delta)
 {
     UIAxis axes = UIAxisNeither;
@@ -603,7 +602,6 @@
         axes = static_cast<UIAxis>(axes | UIAxisVertical);
     return axes;
 }
-#endif
 
 - (void)scrollToContentOffset:(WebCore::FloatPoint)contentOffset animated:(BOOL)animated
 {
@@ -613,11 +611,7 @@
     if (_delegateRespondsToWillScroll)
         [_delegate keyboardScrollViewAnimatorWillScroll:self];
     [scrollView setContentOffset:contentOffset animated:animated];
-#if HAVE(UI_SCROLL_VIEW_INDICATOR_FLASHING_SPI)
     [scrollView _flashScrollIndicatorsForAxes:axesForDelta(WebCore::FloatPoint(scrollView.contentOffset) - contentOffset) persistingPreviousFlashes:YES];
-#else
-    [scrollView _flashScrollIndicatorsPersistingPreviousFlashes:YES];
-#endif
 }
 
 - (void)scrollWithScrollToExtentAnimationTo:(CGPoint)offset
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to