Title: [236968] trunk/Source/WebKit
- Revision
- 236968
- Author
- aes...@apple.com
- Date
- 2018-10-09 10:56:58 -0700 (Tue, 09 Oct 2018)
Log Message
[iOS] Replace @"UIPreviewDataAttachmentListIsContentManaged" with a UIKit constant
https://bugs.webkit.org/show_bug.cgi?id=190400
<rdar://problem/35442879>
Reviewed by Wenson Hsieh.
Also fixed the iOS version check in WKContentViewInteraction.mm.
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _dataForPreviewItemController:atPosition:type:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (236967 => 236968)
--- trunk/Source/WebKit/ChangeLog 2018-10-09 17:40:01 UTC (rev 236967)
+++ trunk/Source/WebKit/ChangeLog 2018-10-09 17:56:58 UTC (rev 236968)
@@ -1,3 +1,17 @@
+2018-10-09 Andy Estes <aes...@apple.com>
+
+ [iOS] Replace @"UIPreviewDataAttachmentListIsContentManaged" with a UIKit constant
+ https://bugs.webkit.org/show_bug.cgi?id=190400
+ <rdar://problem/35442879>
+
+ Reviewed by Wenson Hsieh.
+
+ Also fixed the iOS version check in WKContentViewInteraction.mm.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _dataForPreviewItemController:atPosition:type:]):
+
2018-10-09 Tim Horton <timothy_hor...@apple.com>
REGRESSION (r232416): Can not scroll after swiping back on quoteunquoteapps.com
Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (236967 => 236968)
--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2018-10-09 17:40:01 UTC (rev 236967)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2018-10-09 17:56:58 UTC (rev 236968)
@@ -1121,7 +1121,11 @@
extern const NSString *UIPreviewDataAttachmentList;
extern const NSString *UIPreviewDataAttachmentIndex;
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < 130000
extern NSString * const UIPreviewDataAttachmentListSourceIsManaged;
+#else
+extern NSString * const UIPreviewDataAttachmentListIsContentManaged;
+#endif
UIEdgeInsets UIEdgeInsetsAdd(UIEdgeInsets lhs, UIEdgeInsets rhs, UIRectEdge);
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (236967 => 236968)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-10-09 17:40:01 UTC (rev 236967)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-10-09 17:56:58 UTC (rev 236968)
@@ -6171,11 +6171,10 @@
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[@"UIPreviewDataAttachmentListIsContentManaged"] = [NSNumber numberWithBool:sourceIsManaged];
+#if __IPHONE_OS_VERSION_MIN_REQUIRED < 130000
+ dataForPreview[UIPreviewDataAttachmentListSourceIsManaged] = [NSNumber numberWithBool:sourceIsManaged];
#else
- dataForPreview[UIPreviewDataAttachmentListSourceIsManaged] = [NSNumber numberWithBool:sourceIsManaged];
+ dataForPreview[UIPreviewDataAttachmentListIsContentManaged] = [NSNumber numberWithBool:sourceIsManaged];
#endif
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
