Title: [195829] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 195829
- Author
- [email protected]
- Date
- 2016-01-29 11:15:16 -0800 (Fri, 29 Jan 2016)
Log Message
Merged r195826. rdar://problem/24337778
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (195828 => 195829)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-01-29 19:13:17 UTC (rev 195828)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-01-29 19:15:16 UTC (rev 195829)
@@ -1,3 +1,20 @@
+2016-01-29 Babak Shafiei <[email protected]>
+
+ Merge r195826.
+
+ 2016-01-29 Enrica Casucci <[email protected]>
+
+ Disable text interaction with pencil.
+ https://bugs.webkit.org/show_bug.cgi?id=153655
+ rdar://problem/24337778
+
+ Reviewed by Tim Horton.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _createAndConfigureDoubleTapGestureRecognizer]):
+ (-[WKContentView _singleTapCommited:]):
+
2016-01-28 Babak Shafiei <[email protected]>
Merge r195607.
Modified: branches/safari-601.1.46-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (195828 => 195829)
--- branches/safari-601.1.46-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-01-29 19:13:17 UTC (rev 195828)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-01-29 19:15:16 UTC (rev 195829)
@@ -24,6 +24,7 @@
*/
#import <UIKit/UIKit.h>
+#import <UIKit/UITouch.h>
#if USE(APPLE_INTERNAL_SDK)
@@ -271,6 +272,7 @@
@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 (195828 => 195829)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-01-29 19:13:17 UTC (rev 195828)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-01-29 19:15:16 UTC (rev 195829)
@@ -324,6 +324,7 @@
{
_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()];
@@ -1214,7 +1215,8 @@
// 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.
- if (!_page->editorState().isContentEditable)
+ UITouch *touch = [gestureRecognizer.touches lastObject];
+ if (!_page->editorState().isContentEditable && touch.type == UITouchTypeDirect)
[_webSelectionAssistant clearSelection];
_lastInteractionLocation = gestureRecognizer.location;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
