Changeset 243618 in webkit

Timestamp:

Mar 28, 2019, 1:00:36 PM (7 years ago)

Author:

timothy_horton@apple.com

Message:

Fix the build.

• UIProcess/ios/WKActionSheetAssistant.mm:

(-[WKActionSheetAssistant showImageSheet]):

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView actionSheetAssistant:showCustomSheetForElement:]):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-28  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the build.
+
+        * UIProcess/ios/WKActionSheetAssistant.mm:
+        (-[WKActionSheetAssistant showImageSheet]):
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView actionSheetAssistant:showCustomSheetForElement:]):
+
 2019-03-28  Michael Catanzaro  <mcatanzaro@igalia.com>
 

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

@@ -407 +407 @@
 
         if (!alternateURL && userInfo) {
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
             [UIApp _cancelAllTouches];
+ALLOW_DEPRECATED_DECLARATIONS_END
             return;
         }

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

@@ -5850 +5850 @@
             BOOL shouldCancelAllTouches = YES;
 #endif
+
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
             // Prevent tap-and-hold and panning.
             if (shouldCancelAllTouches)
                 [UIApp _cancelAllTouches];
+ALLOW_DEPRECATED_DECLARATIONS_END
 
             return YES;