Title: [188924] trunk/Source/WebKit2
- Revision
- 188924
- Author
- bda...@apple.com
- Date
- 2015-08-25 11:19:10 -0700 (Tue, 25 Aug 2015)
Log Message
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]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (188923 => 188924)
--- trunk/Source/WebKit2/ChangeLog 2015-08-25 18:13:05 UTC (rev 188923)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-25 18:19:10 UTC (rev 188924)
@@ -1,3 +1,16 @@
+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-24 Gyuyoung Kim <gyuyoung....@webkit.org>
Unreviewed, EFL and GTK build fix since r188895.
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188923 => 188924)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-25 18:13:05 UTC (rev 188923)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-25 18:19:10 UTC (rev 188924)
@@ -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>
@@ -342,6 +345,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
