Title: [243618] trunk/Source/WebKit
- Revision
- 243618
- Author
- [email protected]
- Date
- 2019-03-28 13:00:36 -0700 (Thu, 28 Mar 2019)
Log Message
Fix the build.
* UIProcess/ios/WKActionSheetAssistant.mm:
(-[WKActionSheetAssistant showImageSheet]):
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView actionSheetAssistant:showCustomSheetForElement:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (243617 => 243618)
--- trunk/Source/WebKit/ChangeLog 2019-03-28 19:37:58 UTC (rev 243617)
+++ trunk/Source/WebKit/ChangeLog 2019-03-28 20:00:36 UTC (rev 243618)
@@ -1,3 +1,12 @@
+2019-03-28 Tim Horton <[email protected]>
+
+ Fix the build.
+
+ * UIProcess/ios/WKActionSheetAssistant.mm:
+ (-[WKActionSheetAssistant showImageSheet]):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView actionSheetAssistant:showCustomSheetForElement:]):
+
2019-03-28 Michael Catanzaro <[email protected]>
[WPE][GTK] webkit_web_resource_get_data_finish can return NULL without setting error
Modified: trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm (243617 => 243618)
--- trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm 2019-03-28 19:37:58 UTC (rev 243617)
+++ trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm 2019-03-28 20:00:36 UTC (rev 243618)
@@ -406,7 +406,9 @@
return;
if (!alternateURL && userInfo) {
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
[UIApp _cancelAllTouches];
+ALLOW_DEPRECATED_DECLARATIONS_END
return;
}
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (243617 => 243618)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-03-28 19:37:58 UTC (rev 243617)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-03-28 20:00:36 UTC (rev 243618)
@@ -5849,9 +5849,12 @@
#else
BOOL shouldCancelAllTouches = YES;
#endif
+
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
// Prevent tap-and-hold and panning.
if (shouldCancelAllTouches)
[UIApp _cancelAllTouches];
+ALLOW_DEPRECATED_DECLARATIONS_END
return YES;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
