Changeset 191072 in webkit

Timestamp:

Oct 14, 2015 2:20:50 PM (9 years ago)

Author:

Wenson Hsieh

Message:

Web pages with unscalable viewports shouldn't have a single tap delay
​https://bugs.webkit.org/show_bug.cgi?id=149968
<rdar://problem/23054453>

Reviewed by Simon Fraser.

Source/WebKit2:

When a viewport is unscalable (specified through the meta viewport tag) we
do not add a delay to our single tap gesture recognizer. We do this by
disabling or reinitializing the WKContentView's double tap gesture recognizer
when the viewport becomes unscalable or scalable, respectively. A viewport is
deemed unscalable when it has user-scalable = no, or when the minimum scale is
greater than or equal to the maximum scale.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _didCommitLayerTree:]):

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

(-[WKContentView _createAndConfigureDoubleTapGestureRecognizer]): Pulled logic

for initializing a double tap gesture recognizer out into a helper function.

(-[WKContentView setupInteraction]):
(-[WKContentView _setDoubleTapGesturesEnabled:]): Turns gesture recognition for double

taps on or off.

LayoutTests:

Add a layout test to check that when a viewport is unscalable (specified through
the meta viewport tag) we do not add a delay to our single tap gesture recognizer.

• fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt: Added.
• fast/events/ios/unscalable-viewport-clicks-on-doubletap.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt (added)
• LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap.html (added)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (modified) (1 diff)
• Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-10-14  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Web pages with unscalable viewports shouldn't have a single tap delay
+        https://bugs.webkit.org/show_bug.cgi?id=149968
+        <rdar://problem/23054453>
+
+        Reviewed by Simon Fraser.
+
+        Add a layout test to check that when a viewport is unscalable (specified through
+        the meta viewport tag) we do not add a delay to our single tap gesture recognizer.
+
+        * fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt: Added.
+        * fast/events/ios/unscalable-viewport-clicks-on-doubletap.html: Added.
+
 2015-10-14  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-10-14  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Web pages with unscalable viewports shouldn't have a single tap delay
+        https://bugs.webkit.org/show_bug.cgi?id=149968
+        <rdar://problem/23054453>
+
+        Reviewed by Simon Fraser.
+
+        When a viewport is unscalable (specified through the meta viewport tag) we
+        do not add a delay to our single tap gesture recognizer. We do this by
+        disabling or reinitializing the WKContentView's double tap gesture recognizer
+        when the viewport becomes unscalable or scalable, respectively. A viewport is
+        deemed unscalable when it has user-scalable = no, or when the minimum scale is
+        greater than or equal to the maximum scale.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _didCommitLayerTree:]):
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _createAndConfigureDoubleTapGestureRecognizer]): Pulled logic
+                for initializing a double tap gesture recognizer out into a helper function.
+        (-[WKContentView setupInteraction]):
+        (-[WKContentView _setDoubleTapGesturesEnabled:]): Turns gesture recognition for double
+                taps on or off.
+
 2015-10-14  Anders Carlsson  <andersca@apple.com>
 

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

@@ -1007 +1007 @@
         [_scrollView setZoomScale:layerTreeTransaction.pageScaleFactor()];
 
+    [_contentView _setDoubleTapGesturesEnabled:[_scrollView isZoomEnabled] && [_scrollView minimumZoomScale] < [_scrollView maximumZoomScale]];
+
     [self _updateScrollViewBackground];
 

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

@@ -204 +204 @@
 - (void)_disableInspectorNodeSearch;
 - (void)_becomeFirstResponderWithSelectionMovingForward:(BOOL)selectingForward completionHandler:(void (^)(BOOL didBecomeFirstResponder))completionHandler;
+- (void)_setDoubleTapGesturesEnabled:(BOOL)enabled;
 @end
 

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

@@ -297 +297 @@
 }
 
+- (void)_createAndConfigureDoubleTapGestureRecognizer
+{
+    _doubleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_doubleTapRecognized:)]);
+    [_doubleTapGestureRecognizer setNumberOfTapsRequired:2];
+    [_doubleTapGestureRecognizer setDelegate:self];
+    [self addGestureRecognizer:_doubleTapGestureRecognizer.get()];
+    [_singleTapGestureRecognizer requireOtherGestureToFail:_doubleTapGestureRecognizer.get()];
+}
+
 - (void)setupInteraction
 {
@@ -320 +329 @@
     [self addGestureRecognizer:_singleTapGestureRecognizer.get()];
 
-    _doubleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_doubleTapRecognized:)]);
-    [_doubleTapGestureRecognizer setNumberOfTapsRequired:2];
-    [_doubleTapGestureRecognizer setDelegate:self];
-    [self addGestureRecognizer:_doubleTapGestureRecognizer.get()];
-    [_singleTapGestureRecognizer requireOtherGestureToFail:_doubleTapGestureRecognizer.get()];
+    [self _createAndConfigureDoubleTapGestureRecognizer];
 
     _twoFingerDoubleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_twoFingerDoubleTapRecognized:)]);
@@ -2240 +2245 @@
 }
 
+- (void)_setDoubleTapGesturesEnabled:(BOOL)enabled
+{
+    if (enabled && ![_doubleTapGestureRecognizer isEnabled]) {
+        // The first tap recognized after re-enabling double tap gestures will not wait for the
+        // second tap before committing. To fix this, we use a new double tap gesture recognizer.
+        [self removeGestureRecognizer:_doubleTapGestureRecognizer.get()];
+        [_doubleTapGestureRecognizer setDelegate:nil];
+        [self _createAndConfigureDoubleTapGestureRecognizer];
+    }
+    [_doubleTapGestureRecognizer setEnabled:enabled];
+}
+
 - (void)accessoryAutoFill
 {