Changeset 166605 in webkit

Timestamp:

Apr 1, 2014 1:33:13 PM (10 years ago)

Author:

benjamin@webkit.org

Message:

[iOS][WK2] Remove the two finger pan gesture recognizer until it is actually implemented
​https://bugs.webkit.org/show_bug.cgi?id=131009

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-04-01
Reviewed by Sam Weinig.

The two finger pan should not block the pinch gesture recognizer.

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

(-[WKContentView setupInteraction]):
(-[WKContentView cleanupInteraction]):
(-[WKContentView gestureRecognizerShouldBegin:]):
(-[WKContentView _twoFingerPanRecognized:]): Deleted.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-01  Benjamin Poulain  <bpoulain@apple.com>
+
+        [iOS][WK2] Remove the two finger pan gesture recognizer until it is actually implemented
+        https://bugs.webkit.org/show_bug.cgi?id=131009
+
+        Reviewed by Sam Weinig.
+
+        The two finger pan should not block the pinch gesture recognizer.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView setupInteraction]):
+        (-[WKContentView cleanupInteraction]):
+        (-[WKContentView gestureRecognizerShouldBegin:]):
+        (-[WKContentView _twoFingerPanRecognized:]): Deleted.
+
 2014-04-01  Anders Carlsson  <andersca@apple.com>
 

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

@@ -87 +87 @@
     RetainPtr<UITapGestureRecognizer> _doubleTapGestureRecognizer;
     RetainPtr<UITapGestureRecognizer> _twoFingerDoubleTapGestureRecognizer;
-    RetainPtr<UIPanGestureRecognizer> _twoFingerPanGestureRecognizer;
 
     RetainPtr<UIWKTextInteractionAssistant> _textSelectionAssistant;

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

@@ -165 +165 @@
     [self addGestureRecognizer:_longPressGestureRecognizer.get()];
 
-    _twoFingerPanGestureRecognizer = adoptNS([[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(_twoFingerPanRecognized:)]);
-    [_twoFingerPanGestureRecognizer setMinimumNumberOfTouches:2];
-    [_twoFingerPanGestureRecognizer setMaximumNumberOfTouches:2];
-    [_twoFingerPanGestureRecognizer setDelegate:self];
-    [self addGestureRecognizer:_twoFingerPanGestureRecognizer.get()];
-
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_resetShowingTextStyle:) name:UIMenuControllerDidHideMenuNotification object:nil];
     _showingTextStyleOptions = NO;
@@ -191 +185 @@
     [_highlightLongPressGestureRecognizer setDelegate:nil];
     [_longPressGestureRecognizer setDelegate:nil];
-    [_twoFingerPanGestureRecognizer setDelegate:nil];
 }
 
@@ -560 +553 @@
     }
 
-    if (gestureRecognizer == _twoFingerPanGestureRecognizer) {
-        notImplemented();
-    }
-
     return YES;
 }
@@ -662 +651 @@
 {
     _smartMagnificationController->handleResetMagnificationGesture(gestureRecognizer.location);
-}
-
-- (void)_twoFingerPanRecognized:(UIPanGestureRecognizer *)gestureRecognizer
-{
-    // FIXME: Add implementation.
 }