Title: [224630] trunk/Source/WebKit
- Revision
- 224630
- Author
- aes...@apple.com
- Date
- 2017-11-09 09:20:27 -0800 (Thu, 09 Nov 2017)
Log Message
[iOS] Adopt UIPreviewDataAttachmentListIsContentManaged
https://bugs.webkit.org/show_bug.cgi?id=179458
<rdar://problem/35034691>
Reviewed by Dan Bernstein.
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _dataForPreviewItemController:atPosition:type:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (224629 => 224630)
--- trunk/Source/WebKit/ChangeLog 2017-11-09 17:11:24 UTC (rev 224629)
+++ trunk/Source/WebKit/ChangeLog 2017-11-09 17:20:27 UTC (rev 224630)
@@ -1,3 +1,15 @@
+2017-11-09 Andy Estes <aes...@apple.com>
+
+ [iOS] Adopt UIPreviewDataAttachmentListIsContentManaged
+ https://bugs.webkit.org/show_bug.cgi?id=179458
+ <rdar://problem/35034691>
+
+ Reviewed by Dan Bernstein.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _dataForPreviewItemController:atPosition:type:]):
+
2017-11-08 Joseph Pecoraro <pecor...@apple.com>
Include a more complete block signature in public headers to avoid potential -Wstrict-prototypes warnings
Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (224629 => 224630)
--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2017-11-09 17:11:24 UTC (rev 224629)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2017-11-09 17:20:27 UTC (rev 224630)
@@ -1029,6 +1029,8 @@
extern const NSString *UIPreviewDataAttachmentList;
extern const NSString *UIPreviewDataAttachmentIndex;
+extern NSString * const UIPreviewDataAttachmentListSourceIsManaged;
+
UIEdgeInsets UIEdgeInsetsAdd(UIEdgeInsets lhs, UIEdgeInsets rhs, UIRectEdge);
WTF_EXTERN_C_END
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (224629 => 224630)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2017-11-09 17:11:24 UTC (rev 224629)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2017-11-09 17:20:27 UTC (rev 224630)
@@ -4998,11 +4998,15 @@
dataForPreview[UIPreviewDataAttachmentList] = [uiDelegate _attachmentListForWebView:_webView];
dataForPreview[UIPreviewDataAttachmentIndex] = [NSNumber numberWithUnsignedInteger:index];
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000
// FIXME: Replace the following NSString literal with a UIKit NSString constant.
- dataForPreview[@"UIPreviewDataAttachmentListSourceIsManaged"] = [NSNumber numberWithBool:sourceIsManaged];
+ dataForPreview[@"UIPreviewDataAttachmentListIsContentManaged"] = [NSNumber numberWithBool:sourceIsManaged];
+#else
+ dataForPreview[UIPreviewDataAttachmentListSourceIsManaged] = [NSNumber numberWithBool:sourceIsManaged];
+#endif
}
}
-
+
return dataForPreview;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
