Changeset 189773 in webkit

Timestamp:

Sep 14, 2015 7:42:39 PM (9 years ago)

Author:

Wenson Hsieh

Message:

WKWebView scroll deceleration rate is not being set properly
​https://bugs.webkit.org/show_bug.cgi?id=149145
<rdar://problem/22064071>

Reviewed by Simon Fraser.

We are not currently setting the web view's deceleration rate to the correct preferred value because we
are setting the decelerationRate property of the scrollView, which snaps input values to the closer of
two predefined UIKit constants, UIScrollViewDecelerationRateFast and UIScrollViewDecelerationRateNormal.
To fix this, we directly set the horizontal and vertical scroll deceleration factors to the preferred
value.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView scrollViewWillBeginDragging:]): Directly set the scroll view's deceleration factor without

going through the decelerationRate property.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-09-14  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        WKWebView scroll deceleration rate is not being set properly
+        https://bugs.webkit.org/show_bug.cgi?id=149145
+        <rdar://problem/22064071>
+
+        Reviewed by Simon Fraser.
+
+        We are not currently setting the web view's deceleration rate to the correct preferred value because we
+        are setting the decelerationRate property of the scrollView, which snaps input values to the closer of
+        two predefined UIKit constants, UIScrollViewDecelerationRateFast and UIScrollViewDecelerationRateNormal.
+        To fix this, we directly set the horizontal and vertical scroll deceleration factors to the preferred
+        value.
+
+        * UIProcess/API/Cocoa/WKWebView.mm: 
+        (-[WKWebView scrollViewWillBeginDragging:]): Directly set the scroll view's deceleration factor without
+                going through the decelerationRate property.
+
 2015-09-14  Dan Bernstein  <mitz@apple.com>
 

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

@@ -1481 +1481 @@
     WebKit::RemoteScrollingCoordinatorProxy* coordinator = _page->scrollingCoordinatorProxy();
     ASSERT(scrollView == _scrollView.get());
-    scrollView.decelerationRate = (coordinator && coordinator->shouldSetScrollViewDecelerationRateFast()) ? UIScrollViewDecelerationRateFast : [_scrollView preferredScrollDecelerationFactor];
+    CGFloat scrollDecelerationFactor = (coordinator && coordinator->shouldSetScrollViewDecelerationRateFast()) ? UIScrollViewDecelerationRateFast : [_scrollView preferredScrollDecelerationFactor];
+    scrollView.horizontalScrollDecelerationFactor = scrollDecelerationFactor;
+    scrollView.verticalScrollDecelerationFactor = scrollDecelerationFactor;
 #endif
 }