Title: [260982] trunk/Source/WebKit
- Revision
- 260982
- Author
- [email protected]
- Date
- 2020-04-30 20:57:55 -0700 (Thu, 30 Apr 2020)
Log Message
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:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (260981 => 260982)
--- trunk/Source/WebKit/ChangeLog 2020-05-01 03:48:29 UTC (rev 260981)
+++ trunk/Source/WebKit/ChangeLog 2020-05-01 03:57:55 UTC (rev 260982)
@@ -1,3 +1,14 @@
+2020-04-30 Wenson Hsieh <[email protected]>
+
+ 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-04-30 Simon Fraser <[email protected]>
Clean up some EventHandler coordinate-related naming and fix ScrollableArea::lastKnownMousePosition() conversions
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (260981 => 260982)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-05-01 03:48:29 UTC (rev 260981)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-05-01 03:57:55 UTC (rev 260982)
@@ -7110,7 +7110,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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
