Title: [166605] trunk/Source/WebKit2
- Revision
- 166605
- Author
- benja...@webkit.org
- Date
- 2014-04-01 13:33:13 -0700 (Tue, 01 Apr 2014)
Log 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 <bpoul...@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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166604 => 166605)
--- trunk/Source/WebKit2/ChangeLog 2014-04-01 20:32:33 UTC (rev 166604)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-01 20:33:13 UTC (rev 166605)
@@ -1,3 +1,19 @@
+2014-04-01 Benjamin Poulain <bpoul...@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 <ander...@apple.com>
Remove limits from WKBackForwardList getters
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (166604 => 166605)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-04-01 20:32:33 UTC (rev 166604)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-04-01 20:33:13 UTC (rev 166605)
@@ -86,7 +86,6 @@
RetainPtr<UILongPressGestureRecognizer> _longPressGestureRecognizer;
RetainPtr<UITapGestureRecognizer> _doubleTapGestureRecognizer;
RetainPtr<UITapGestureRecognizer> _twoFingerDoubleTapGestureRecognizer;
- RetainPtr<UIPanGestureRecognizer> _twoFingerPanGestureRecognizer;
RetainPtr<UIWKTextInteractionAssistant> _textSelectionAssistant;
RetainPtr<UIWKSelectionAssistant> _webSelectionAssistant;
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (166604 => 166605)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-04-01 20:32:33 UTC (rev 166604)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-04-01 20:33:13 UTC (rev 166605)
@@ -164,12 +164,6 @@
[_longPressGestureRecognizer setDelegate:self];
[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;
@@ -190,7 +184,6 @@
[_doubleTapGestureRecognizer setDelegate:nil];
[_highlightLongPressGestureRecognizer setDelegate:nil];
[_longPressGestureRecognizer setDelegate:nil];
- [_twoFingerPanGestureRecognizer setDelegate:nil];
}
- (const InteractionInformationAtPosition&)positionInformation
@@ -559,10 +552,6 @@
}
}
- if (gestureRecognizer == _twoFingerPanGestureRecognizer) {
- notImplemented();
- }
-
return YES;
}
@@ -663,11 +652,6 @@
_smartMagnificationController->handleResetMagnificationGesture(gestureRecognizer.location);
}
-- (void)_twoFingerPanRecognized:(UIPanGestureRecognizer *)gestureRecognizer
-{
- // FIXME: Add implementation.
-}
-
- (void)_attemptClickAtLocation:(CGPoint)location
{
// FIXME: Ideally, we should always provide some visual feedback on click. If a short tap did not trigger the
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
