Changeset 228016 in webkit

Timestamp:

Feb 2, 2018 9:44:36 AM (6 years ago)

Author:

Wenson Hsieh

Message:

[Extra Zoom Mode] Implement support for indirect mainframe scrolling
​https://bugs.webkit.org/show_bug.cgi?id=182421
<rdar://problem/35142694>

Reviewed by Tim Horton.

Makes a few small adjustments to WKScrollView to improve mainframe scrolling, and disable the pinch gesture for
zooming. See below for more details.

• UIProcess/API/Cocoa/WKWebView.mm:

Remove a now-unneeded WebKitAdditions import.

• UIProcess/ios/WKScrollView.mm:

(-[WKScrollView initWithFrame:]):

Add imports for -Before and -After versions of WKScrollViewAdditions.

(-[WKScrollView addGestureRecognizer:]):

Override -addGestureRecognizer here to prevent touches on the pinch gesture recognizer from being recognized.
I chose this approach instead of just disabling the gesture in -initWithFrame: because (1) the pinch gesture
recognizer is lazily created when setting minimum or maximum zoom scales, rather than immediately in
-initWithFrame:, and (2) even if we set the -enabled to NO, UIKit later resets it to YES in other codepaths.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-02-02  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [Extra Zoom Mode] Implement support for indirect mainframe scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=182421
+        <rdar://problem/35142694>
+
+        Reviewed by Tim Horton.
+
+        Makes a few small adjustments to WKScrollView to improve mainframe scrolling, and disable the pinch gesture for
+        zooming. See below for more details.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+
+        Remove a now-unneeded WebKitAdditions import.
+
+        * UIProcess/ios/WKScrollView.mm:
+        (-[WKScrollView initWithFrame:]):
+
+        Add imports for -Before and -After versions of WKScrollViewAdditions.
+
+        (-[WKScrollView addGestureRecognizer:]):
+
+        Override -addGestureRecognizer here to prevent touches on the pinch gesture recognizer from being recognized.
+        I chose this approach instead of just disabling the gesture in -initWithFrame: because (1) the pinch gesture
+        recognizer is lazily created when setting minimum or maximum zoom scales, rather than immediately in
+        -initWithFrame:, and (2) even if we set the -enabled to NO, UIKit later resets it to YES in other codepaths.
+
 2018-02-01  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -6341 +6341 @@
 @end
 
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKWebViewAdditionsAfter.mm>
-#endif
-
 #endif // WK_API_ENABLED

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

@@ -35 +35 @@
 using namespace WebKit;
 
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKScrollViewAdditionsBefore.mm>
+#endif
+
 @interface UIScrollView (UIScrollViewInternalHack)
 - (CGFloat)_rubberBandOffsetForOffset:(CGFloat)newOffset maxOffset:(CGFloat)maxOffset minOffset:(CGFloat)minOffset range:(CGFloat)range outside:(BOOL *)outside;
@@ -135 +139 @@
 #endif
     
+#if ENABLE(EXTRA_ZOOM_MODE)
+    [self _configureScrollingForExtraZoomMode];
+#endif
+
     return self;
 }
@@ -312 +320 @@
 }
 
+- (void)addGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
+{
+    [super addGestureRecognizer:gestureRecognizer];
+
+#if ENABLE(EXTRA_ZOOM_MODE)
+    if (gestureRecognizer == self.pinchGestureRecognizer)
+        gestureRecognizer.allowedTouchTypes = @[];
+#endif
+}
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKScrollViewAdditionsAfter.mm>
+#endif
+
 @end