Changeset 261361 in webkit

Timestamp:

May 7, 2020 5:39:24 PM (4 years ago)

Author:

Megan Gardner

Message:

Build Fix for MacCatalyst
​https://bugs.webkit.org/show_bug.cgi?id=211601

Reviewed by Tim Horton.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _removeContextMenuViewIfPossible]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-07  Megan Gardner  <megan_gardner@apple.com>
+
+        Build Fix for MacCatalyst
+        https://bugs.webkit.org/show_bug.cgi?id=211601
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _removeContextMenuViewIfPossible]):
+
 2020-05-07  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -7677 +7677 @@
 - (void)_removeContextMenuViewIfPossible
 {
+#if HAVE(LINK_PREVIEW)
     // If a new _contextMenuElementInfo is installed, we've started another interaction,
     // and removing the hint container view will cause the animation to break.
     if (_contextMenuElementInfo)
         return;
-    // We are also using this container for the file upload panel...
+#endif
+#if ENABLE(DATA_DETECTION)
+    // We are also using this container for the action sheet assistant...
+    if ([_actionSheetAssistant hasContextMenuInteraction])
+        return;
+#endif
+    // and for the file upload panel.
     if (_fileUploadPanel)
         return;
-    // and the action sheet assistant.
-    if ([_actionSheetAssistant hasContextMenuInteraction])
-        return;
+    
     [std::exchange(_contextMenuHintContainerView, nil) removeFromSuperview];
 }