Title: [196645] trunk/Source/WebKit2
- Revision
- 196645
- Author
- wei...@apple.com
- Date
- 2016-02-16 11:33:54 -0800 (Tue, 16 Feb 2016)
Log Message
Revert r195826.
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _createAndConfigureDoubleTapGestureRecognizer]):
(-[WKContentView _singleTapCommited:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (196644 => 196645)
--- trunk/Source/WebKit2/ChangeLog 2016-02-16 19:28:09 UTC (rev 196644)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-16 19:33:54 UTC (rev 196645)
@@ -1,3 +1,12 @@
+2016-02-16 Sam Weinig <s...@webkit.org>
+
+ Revert r195826.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _createAndConfigureDoubleTapGestureRecognizer]):
+ (-[WKContentView _singleTapCommited:]):
+
2016-02-16 Csaba Osztrogonác <o...@webkit.org>
[Mac][cmake] Unreviewed buildfix after r196488. Just for fun.
Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (196644 => 196645)
--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-02-16 19:28:09 UTC (rev 196644)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-02-16 19:33:54 UTC (rev 196645)
@@ -24,7 +24,6 @@
*/
#import <UIKit/UIKit.h>
-#import <UIKit/UITouch.h>
#if USE(APPLE_INTERNAL_SDK)
@@ -317,7 +316,6 @@
@interface UITapGestureRecognizer ()
@property (nonatomic, readonly) CGPoint location;
-@property (nonatomic, readonly) NSArray *touches;
@end
@class WebEvent;
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (196644 => 196645)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-02-16 19:28:09 UTC (rev 196644)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-02-16 19:33:54 UTC (rev 196645)
@@ -433,7 +433,6 @@
{
_doubleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_doubleTapRecognized:)]);
[_doubleTapGestureRecognizer setNumberOfTapsRequired:2];
- [_doubleTapGestureRecognizer setAllowedTouchTypes:@[@(UITouchTypeDirect)]];
[_doubleTapGestureRecognizer setDelegate:self];
[self addGestureRecognizer:_doubleTapGestureRecognizer.get()];
[_singleTapGestureRecognizer requireOtherGestureToFail:_doubleTapGestureRecognizer.get()];
@@ -1332,8 +1331,7 @@
// We don't want to clear the selection if it is in editable content.
// The selection could have been set by autofocusing on page load and not
// reflected in the UI process since the user was not interacting with the page.
- UITouch *touch = [gestureRecognizer.touches lastObject];
- if (!_page->editorState().isContentEditable && touch.type == UITouchTypeDirect)
+ if (!_page->editorState().isContentEditable)
[_webSelectionAssistant clearSelection];
_lastInteractionLocation = gestureRecognizer.location;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
