Title: [196649] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 196649
- Author
- [email protected]
- Date
- 2016-02-16 12:35:47 -0800 (Tue, 16 Feb 2016)
Log Message
Merged r196645. rdar://problem/24679618
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (196648 => 196649)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-02-16 20:23:02 UTC (rev 196648)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-02-16 20:35:47 UTC (rev 196649)
@@ -1,3 +1,16 @@
+2016-02-16 Babak Shafiei <[email protected]>
+
+ Merge r196645.
+
+ 2016-02-16 Sam Weinig <[email protected]>
+
+ Revert r195826.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _createAndConfigureDoubleTapGestureRecognizer]):
+ (-[WKContentView _singleTapCommited:]):
+
2016-01-29 Babak Shafiei <[email protected]>
Merge r195826.
Modified: branches/safari-601.1.46-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (196648 => 196649)
--- branches/safari-601.1.46-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-02-16 20:23:02 UTC (rev 196648)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-02-16 20:35:47 UTC (rev 196649)
@@ -24,7 +24,6 @@
*/
#import <UIKit/UIKit.h>
-#import <UIKit/UITouch.h>
#if USE(APPLE_INTERNAL_SDK)
@@ -272,7 +271,6 @@
@interface UITapGestureRecognizer (Details)
@property (nonatomic, readonly) CGPoint location;
-@property (nonatomic, readonly) NSArray *touches;
@end
@class WebEvent;
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (196648 => 196649)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-02-16 20:23:02 UTC (rev 196648)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-02-16 20:35:47 UTC (rev 196649)
@@ -324,7 +324,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()];
@@ -1215,8 +1214,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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
