Title: [188998] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 188998
- Author
- bshaf...@apple.com
- Date
- 2015-08-26 15:23:30 -0700 (Wed, 26 Aug 2015)
Log Message
Merged r188924. rdar://problem/22441181
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188997 => 188998)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-26 22:22:29 UTC (rev 188997)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-26 22:23:30 UTC (rev 188998)
@@ -1,3 +1,20 @@
+2015-08-26 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r188924.
+
+ 2015-08-25 Beth Dakin <bda...@apple.com>
+
+ Long press gesture recognizer should adjust delay based on other recognizers
+ https://bugs.webkit.org/show_bug.cgi?id=148402
+ -and corresponding-
+ rdar://problem/22278723
+
+ Reviewed by Tim Horton.
+
+ Call _setAdjustsDelayBasedOnOtherRecognizers with a value of YES.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setupInteraction]):
+
2015-08-12 Babak Shafiei <bshaf...@apple.com>
Merge r188349.
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188997 => 188998)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-26 22:22:29 UTC (rev 188997)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-26 22:23:30 UTC (rev 188998)
@@ -70,6 +70,9 @@
#import <WebCore/TextIndicator.h>
#import <WebCore/WebEvent.h>
#import <WebKit/WebSelectionRect.h> // FIXME: WK2 should not include WebKit headers!
+#if __has_include(<WebKitAdditions/WKContentViewInteraction.mm>)
+#import <WebKitAdditions/WKContentViewInteraction.mm>
+#endif
#import <WebKitSystemInterfaceIOS.h>
#import <wtf/RetainPtr.h>
@@ -346,6 +349,10 @@
_longPressGestureRecognizer = adoptNS([[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_longPressRecognized:)]);
[_longPressGestureRecognizer setDelay:tapAndHoldDelay];
[_longPressGestureRecognizer setDelegate:self];
+#if __has_include(<WebKitAdditions/WKContentViewInteraction.mm>)
+ if ([_longPressGestureRecognizer respondsToSelector:@selector(_setAdjustsDelayBasedOnOtherRecognizers:)])
+ [_longPressGestureRecognizer _setAdjustsDelayBasedOnOtherRecognizers:YES];
+#endif
[self addGestureRecognizer:_longPressGestureRecognizer.get()];
#if HAVE(LINK_PREVIEW)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
