Title: [188999] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 188999
- Author
- bshaf...@apple.com
- Date
- 2015-08-26 15:24:26 -0700 (Wed, 26 Aug 2015)
Log Message
Merged r188933. rdar://problem/22441181
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188998 => 188999)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-26 22:23:30 UTC (rev 188998)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-26 22:24:26 UTC (rev 188999)
@@ -1,5 +1,16 @@
2015-08-26 Babak Shafiei <bshaf...@apple.com>
+ Merge r188933.
+
+ 2015-08-25 Beth Dakin <bda...@apple.com>
+
+ Speculative build fix.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setupInteraction]):
+
+2015-08-26 Babak Shafiei <bshaf...@apple.com>
+
Merge r188924.
2015-08-25 Beth Dakin <bda...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188998 => 188999)
--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-26 22:23:30 UTC (rev 188998)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-26 22:24:26 UTC (rev 188999)
@@ -349,7 +349,7 @@
_longPressGestureRecognizer = adoptNS([[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_longPressRecognized:)]);
[_longPressGestureRecognizer setDelay:tapAndHoldDelay];
[_longPressGestureRecognizer setDelegate:self];
-#if __has_include(<WebKitAdditions/WKContentViewInteraction.mm>)
+#if __has_include(<WebKitAdditions/WKContentViewInteraction.mm>) && HAVE(LINK_PREVIEW)
if ([_longPressGestureRecognizer respondsToSelector:@selector(_setAdjustsDelayBasedOnOtherRecognizers:)])
[_longPressGestureRecognizer _setAdjustsDelayBasedOnOtherRecognizers:YES];
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
