Changeset 236968 in webkit

Timestamp:

Oct 9, 2018, 10:56:58 AM (8 years ago)

Author:

aestes@apple.com

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:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-10-09  Andy Estes  <aestes@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_horton@apple.com>
 

trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h

@@ -1122 +1122 @@
 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);

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

@@ -6172 +6172 @@
             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
         }