Changeset 175827 in webkit

Timestamp:

Nov 10, 2014, 1:39:02 PM (11 years ago)

Author:

Simon Fraser

Message:

[iOS WK2] Scroll deceleration rate is wrong
​https://bugs.webkit.org/show_bug.cgi?id=138574
rdar://problem/18715303

Reviewed by Benjamin Poulain.

The CSS Snap Points code incorrectly set the WKScrollView's deceleration rate,
overriding the custom value that UIWebScrollView sets.

Fix by having WKScrollView store the custom rate at init time, and
using that value in -scrollViewWillBeginDragging:.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView scrollViewWillBeginDragging:]):

• UIProcess/ios/WKScrollView.h:
• UIProcess/ios/WKScrollView.mm:

(-[WKScrollView initWithFrame:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/ios/WKScrollView.h (modified) (1 diff)
• UIProcess/ios/WKScrollView.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog ¶

@@ +1 @@
+2014-11-10  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] Scroll deceleration rate is wrong
+        https://bugs.webkit.org/show_bug.cgi?id=138574
+        rdar://problem/18715303
+
+        Reviewed by Benjamin Poulain.
+        
+        The CSS Snap Points code incorrectly set the WKScrollView's deceleration rate,
+        overriding the custom value that UIWebScrollView sets.
+        
+        Fix by having WKScrollView store the custom rate at init time, and
+        using that value in -scrollViewWillBeginDragging:.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView scrollViewWillBeginDragging:]):
+        * UIProcess/ios/WKScrollView.h:
+        * UIProcess/ios/WKScrollView.mm:
+        (-[WKScrollView initWithFrame:]):
+
 2014-11-09  Ada Chan  <adachan@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm ¶

@@ -1308 +1308 @@
     if (scrollView.panGestureRecognizer.state == UIGestureRecognizerStateBegan)
         [_contentView scrollViewWillStartPanOrPinchGesture];
+
     [_contentView willStartZoomOrScroll];
 #if ENABLE(CSS_SCROLL_SNAP) && ENABLE(ASYNC_SCROLLING)
     // FIXME: We will want to detect whether snapping will occur before beginning to drag. See WebPageProxy::didCommitLayerTree.
     WebKit::RemoteScrollingCoordinatorProxy* coordinator = _page->scrollingCoordinatorProxy();
-    scrollView.decelerationRate = (coordinator && coordinator->shouldSetScrollViewDecelerationRateFast()) ? UIScrollViewDecelerationRateFast : UIScrollViewDecelerationRateNormal;
+    ASSERT(scrollView == _scrollView.get());
+    scrollView.decelerationRate = (coordinator && coordinator->shouldSetScrollViewDecelerationRateFast()) ? UIScrollViewDecelerationRateFast : [_scrollView preferredScrollDecelerationFactor];;
 #endif
 }

trunk/Source/WebKit2/UIProcess/ios/WKScrollView.h ¶

@@ -33 +33 @@
 
 @property (nonatomic, assign) WKWebView <UIScrollViewDelegate> *internalDelegate;
+@property (nonatomic, readonly) CGFloat preferredScrollDecelerationFactor;
 
 - (void)_setContentSizePreservingContentOffsetDuringRubberband:(CGSize)contentSize;

trunk/Source/WebKit2/UIProcess/ios/WKScrollView.mm ¶

@@ -112 +112 @@
 }
 
+- (id)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        ASSERT([self verticalScrollDecelerationFactor] == [self horizontalScrollDecelerationFactor]);
+        // FIXME: use UIWebPreferredScrollDecelerationFactor() from UIKit: rdar://problem/18931007.
+        _preferredScrollDecelerationFactor = [self verticalScrollDecelerationFactor];
+    }
+    
+    return self;
+}
+
 - (void)setInternalDelegate:(WKWebView <UIScrollViewDelegate> *)internalDelegate
 {