Changeset 211197 in webkit

Timestamp:

Jan 25, 2017, 8:05:25 PM (8 years ago)

Author:

timothy_horton@apple.com

Message:

Stop inheriting from UIWebScrollView, just use UIScrollView
​https://bugs.webkit.org/show_bug.cgi?id=167440
<rdar://problem/7729691>

Reviewed by Simon Fraser.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView scrollViewWillBeginDragging:]):

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

(-[WKScrollView initWithFrame:]): Deleted.
(-[WKScrollView setDecelerationRate:]): Deleted.
Inherit directly from UIScrollView, no need for UIWebScrollView.
Set the few settings we care about directly.
This has the side effect of reducing the default rate of scroll deceleration.

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) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-01-25  Tim Horton  <timothy_horton@apple.com>
+
+        Stop inheriting from UIWebScrollView, just use UIScrollView
+        https://bugs.webkit.org/show_bug.cgi?id=167440
+        <rdar://problem/7729691>
+
+        Reviewed by Simon Fraser.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView scrollViewWillBeginDragging:]):
+        * UIProcess/ios/WKScrollView.h:
+        * UIProcess/ios/WKScrollView.mm:
+        (-[WKScrollView initWithFrame:]): Deleted.
+        (-[WKScrollView setDecelerationRate:]): Deleted.
+        Inherit directly from UIScrollView, no need for UIWebScrollView.
+        Set the few settings we care about directly.
+        This has the side effect of reducing the default rate of scroll deceleration.
+
 2017-01-25  Matt Rajca  <mrajca@apple.com>
 

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

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

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

@@ -30 +30 @@
 @class WKWebView;
 
-@interface WKScrollView : UIWebScrollView
+@interface WKScrollView : UIScrollView
 
 @property (nonatomic, assign) WKWebView <UIScrollViewDelegate> *internalDelegate;
-@property (nonatomic, readonly) CGFloat preferredScrollDecelerationFactor;
 
 - (void)_setContentSizePreservingContentOffsetDuringRubberband:(CGSize)contentSize;

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

@@ -119 +119 @@
 - (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];
-    }
+    self = [super initWithFrame:frame];
+
+    if (!self)
+        return nil;
+
+    self.alwaysBounceVertical = YES;
+    self.directionalLockEnabled = YES;
     
     return self;
@@ -274 +276 @@
 }
 
-- (void)setDecelerationRate:(CGFloat)decelerationRate
-{
-    [super setDecelerationRate:decelerationRate];
-    _preferredScrollDecelerationFactor = decelerationRate;
-}
-
 @end