Title: [258183] trunk/Source
- Revision
- 258183
- Author
- megan_gard...@apple.com
- Date
- 2020-03-09 21:04:06 -0700 (Mon, 09 Mar 2020)
Log Message
Build Fix
https://bugs.webkit.org/show_bug.cgi?id=208838
Source/WebKit:
Build fix of older iOS.
Reviewed by Tim Horton.
* UIProcess/ios/WKActionSheetAssistant.mm:
(-[WKActionSheetAssistant showDataDetectorsSheet]):
* UIProcess/ios/forms/WKFileUploadPanel.mm:
(-[WKFileUploadPanel showDocumentPickerMenu]):
Source/WTF:
Reviewed by Tim Horton.
* wtf/PlatformHave.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (258182 => 258183)
--- trunk/Source/WTF/ChangeLog 2020-03-10 02:54:03 UTC (rev 258182)
+++ trunk/Source/WTF/ChangeLog 2020-03-10 04:04:06 UTC (rev 258183)
@@ -1,3 +1,12 @@
+2020-03-09 Megan Gardner <megan_gard...@apple.com>
+
+ Build Fix
+ https://bugs.webkit.org/show_bug.cgi?id=208838
+
+ Reviewed by Tim Horton.
+
+ * wtf/PlatformHave.h:
+
2020-03-09 Don Olmstead <don.olmst...@sony.com>
Remove obsolete feature flags
Modified: trunk/Source/WTF/wtf/PlatformHave.h (258182 => 258183)
--- trunk/Source/WTF/wtf/PlatformHave.h 2020-03-10 02:54:03 UTC (rev 258182)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2020-03-10 04:04:06 UTC (rev 258183)
@@ -606,6 +606,10 @@
#define HAVE_INCREMENTAL_PDF_APIS 1
#endif
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#define HAVE_UICONTEXTMENU_LOCATION 1
+#endif
+
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101600) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
#define HAVE_SYSTEM_FEATURE_FLAGS 1
#endif
Modified: trunk/Source/WebKit/ChangeLog (258182 => 258183)
--- trunk/Source/WebKit/ChangeLog 2020-03-10 02:54:03 UTC (rev 258182)
+++ trunk/Source/WebKit/ChangeLog 2020-03-10 04:04:06 UTC (rev 258183)
@@ -1,3 +1,17 @@
+2020-03-09 Megan Gardner <megan_gard...@apple.com>
+
+ Build Fix
+ https://bugs.webkit.org/show_bug.cgi?id=208838
+
+ Build fix of older iOS.
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/ios/WKActionSheetAssistant.mm:
+ (-[WKActionSheetAssistant showDataDetectorsSheet]):
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (-[WKFileUploadPanel showDocumentPickerMenu]):
+
2020-03-09 Simon Fraser <simon.fra...@apple.com>
ASSERT(!m_textCheckingRequest) on editing/spelling/spellcheck-async-remove-frame.html
Modified: trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm (258182 => 258183)
--- trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm 2020-03-10 02:54:03 UTC (rev 258182)
+++ trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm 2020-03-10 04:04:06 UTC (rev 258183)
@@ -689,7 +689,7 @@
if ([dataDetectorsActions count] == 0)
return;
-#if ENABLE(DATA_DETECTION) && USE(UICONTEXTMENU)
+#if ENABLE(DATA_DETECTION) && USE(UICONTEXTMENU) && HAVE(UICONTEXTMENU_LOCATION)
auto delegate = _delegate.get();
if ([delegate respondsToSelector:@selector(contextMenuPresentationLocationForActionSheetAssistant:)]) {
[self ensureContextMenuInteraction];
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm (258182 => 258183)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2020-03-10 02:54:03 UTC (rev 258182)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2020-03-10 04:04:06 UTC (rev 258183)
@@ -499,16 +499,12 @@
- (void)showDocumentPickerMenu
{
-#if USE(UICONTEXTMENU)
-#if PLATFORM(MACCATALYST)
// FIXME 49961589: Support picking media with UIImagePickerController
- BOOL shouldPresentDocumentMenuViewController = NO;
-#else
+#if HAVE(UICONTEXTMENU_LOCATION)
NSArray *mediaTypes = UTIsForMIMETypes(_mimeTypes.get()).allObjects;
BOOL allowsImageMediaType = !mediaTypes.count || arrayContainsUTIThatConformsTo(mediaTypes, kUTTypeImage);
BOOL allowsVideoMediaType = !mediaTypes.count || arrayContainsUTIThatConformsTo(mediaTypes, kUTTypeMovie);
BOOL shouldPresentDocumentMenuViewController = allowsImageMediaType || allowsVideoMediaType;
-#endif
if (shouldPresentDocumentMenuViewController) {
[self ensureContextMenuInteraction];
[_documentContextMenuInteraction _presentMenuAtLocation:CGPointMake(_interactionPoint.x, _interactionPoint.y)];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
