Title: [261657] branches/safari-609-branch/Source/WebKit
- Revision
- 261657
- Author
- alanc...@apple.com
- Date
- 2020-05-13 14:38:40 -0700 (Wed, 13 May 2020)
Log Message
Cherry-pick r260982. rdar://problem/62978869
Unreviewed, fix the Mac Catalyst build after r260979
The presence of `_contextMenuInteraction` is conditional not only on `USE(UICONTEXTMENU)`, but also
`HAVE(LINK_PREVIEW)`. Guard logic in `-deferringGestureRecognizer:shouldDeferOtherGestureRecognizer:` with the
latter as well.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView deferringGestureRecognizer:shouldDeferOtherGestureRecognizer:]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260982 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (261656 => 261657)
--- branches/safari-609-branch/Source/WebKit/ChangeLog 2020-05-13 21:37:19 UTC (rev 261656)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog 2020-05-13 21:38:40 UTC (rev 261657)
@@ -1,3 +1,29 @@
+2020-05-13 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r260982. rdar://problem/62978869
+
+ Unreviewed, fix the Mac Catalyst build after r260979
+
+ The presence of `_contextMenuInteraction` is conditional not only on `USE(UICONTEXTMENU)`, but also
+ `HAVE(LINK_PREVIEW)`. Guard logic in `-deferringGestureRecognizer:shouldDeferOtherGestureRecognizer:` with the
+ latter as well.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView deferringGestureRecognizer:shouldDeferOtherGestureRecognizer:]):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260982 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-30 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Unreviewed, fix the Mac Catalyst build after r260979
+
+ The presence of `_contextMenuInteraction` is conditional not only on `USE(UICONTEXTMENU)`, but also
+ `HAVE(LINK_PREVIEW)`. Guard logic in `-deferringGestureRecognizer:shouldDeferOtherGestureRecognizer:` with the
+ latter as well.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView deferringGestureRecognizer:shouldDeferOtherGestureRecognizer:]):
+
2020-05-13 Alan Coon <alanc...@apple.com>
Cherry-pick r259892. rdar://problem/63189085
Modified: branches/safari-609-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (261656 => 261657)
--- branches/safari-609-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-05-13 21:37:19 UTC (rev 261656)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-05-13 21:38:40 UTC (rev 261657)
@@ -6893,7 +6893,7 @@
return NO;
auto mayDelayResetOfContainingSubgraph = [&](UIGestureRecognizer *gesture) -> BOOL {
-#if USE(UICONTEXTMENU)
+#if USE(UICONTEXTMENU) && HAVE(LINK_PREVIEW)
if (gesture == [_contextMenuInteraction gestureRecognizerForFailureRelationships])
return YES;
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
