Title: [239300] tags/Safari-607.1.16.5/Source/WebKit
- Revision
- 239300
- Author
- alanc...@apple.com
- Date
- 2018-12-17 15:58:27 -0800 (Mon, 17 Dec 2018)
Log Message
Cherry-pick r239059. rdar://problem/46382007
Animated scrolling on Google Maps scrolls the page in addition to moving the map
https://bugs.webkit.org/show_bug.cgi?id=192521
<rdar://problem/46382007>
Reviewed by Sam Weinig.
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKKeyboardScrollingAnimator.mm:
(-[WKKeyboardScrollViewAnimator rubberbandableDirections]):
Only do keyboard-based rubber-banding in directions that we can actually
scroll, not directions we can only finger-rubber-band in. This effectively
means keyboard scrolling will ignore "alwaysBounce{Vertical, Horizontal}".
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239059 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-607.1.16.5/Source/WebKit/ChangeLog (239299 => 239300)
--- tags/Safari-607.1.16.5/Source/WebKit/ChangeLog 2018-12-17 23:56:09 UTC (rev 239299)
+++ tags/Safari-607.1.16.5/Source/WebKit/ChangeLog 2018-12-17 23:58:27 UTC (rev 239300)
@@ -1,3 +1,38 @@
+2018-12-17 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r239059. rdar://problem/46382007
+
+ Animated scrolling on Google Maps scrolls the page in addition to moving the map
+ https://bugs.webkit.org/show_bug.cgi?id=192521
+ <rdar://problem/46382007>
+
+ Reviewed by Sam Weinig.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKKeyboardScrollingAnimator.mm:
+ (-[WKKeyboardScrollViewAnimator rubberbandableDirections]):
+ Only do keyboard-based rubber-banding in directions that we can actually
+ scroll, not directions we can only finger-rubber-band in. This effectively
+ means keyboard scrolling will ignore "alwaysBounce{Vertical, Horizontal}".
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239059 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-12-10 Tim Horton <timothy_hor...@apple.com>
+
+ Animated scrolling on Google Maps scrolls the page in addition to moving the map
+ https://bugs.webkit.org/show_bug.cgi?id=192521
+ <rdar://problem/46382007>
+
+ Reviewed by Sam Weinig.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKKeyboardScrollingAnimator.mm:
+ (-[WKKeyboardScrollViewAnimator rubberbandableDirections]):
+ Only do keyboard-based rubber-banding in directions that we can actually
+ scroll, not directions we can only finger-rubber-band in. This effectively
+ means keyboard scrolling will ignore "alwaysBounce{Vertical, Horizontal}".
+
2018-12-14 Kocsen Chung <kocsen_ch...@apple.com>
Cherry-pick r239228. rdar://problem/46715748
Modified: tags/Safari-607.1.16.5/Source/WebKit/Platform/spi/ios/UIKitSPI.h (239299 => 239300)
--- tags/Safari-607.1.16.5/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2018-12-17 23:56:09 UTC (rev 239299)
+++ tags/Safari-607.1.16.5/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2018-12-17 23:58:27 UTC (rev 239300)
@@ -1048,8 +1048,8 @@
- (void)_adjustForAutomaticKeyboardInfo:(NSDictionary *)info animated:(BOOL)animated lastAdjustment:(CGFloat*)lastAdjustment;
- (BOOL)_isScrollingToTop;
- (CGPoint)_animatedTargetOffset;
-- (BOOL)_canScrollX;
-- (BOOL)_canScrollY;
+- (BOOL)_canScrollWithoutBouncingX;
+- (BOOL)_canScrollWithoutBouncingY;
- (void)_setContentOffsetWithDecelerationAnimation:(CGPoint)contentOffset;
- (CGPoint)_adjustedContentOffsetForContentOffset:(CGPoint)contentOffset;
- (void)_flashScrollIndicatorsPersistingPreviousFlashes:(BOOL)persisting;
Modified: tags/Safari-607.1.16.5/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm (239299 => 239300)
--- tags/Safari-607.1.16.5/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm 2018-12-17 23:56:09 UTC (rev 239299)
+++ tags/Safari-607.1.16.5/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm 2018-12-17 23:58:27 UTC (rev 239300)
@@ -623,9 +623,9 @@
WebCore::RectEdges<bool> edges;
- edges.setTop(scrollView._canScrollY);
+ edges.setTop(scrollView._canScrollWithoutBouncingY);
edges.setBottom(edges.top());
- edges.setLeft(scrollView._canScrollX);
+ edges.setLeft(scrollView._canScrollWithoutBouncingX);
edges.setRight(edges.left());
return edges;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
