Title: [215999] tags/Safari-604.1.19.1/Source/WebCore
- Revision
- 215999
- Author
- [email protected]
- Date
- 2017-04-30 14:24:37 -0700 (Sun, 30 Apr 2017)
Log Message
Cherry-pick r215990. rdar://problem/31906525
Modified Paths
Diff
Modified: tags/Safari-604.1.19.1/Source/WebCore/ChangeLog (215998 => 215999)
--- tags/Safari-604.1.19.1/Source/WebCore/ChangeLog 2017-04-30 21:23:01 UTC (rev 215998)
+++ tags/Safari-604.1.19.1/Source/WebCore/ChangeLog 2017-04-30 21:24:37 UTC (rev 215999)
@@ -1,3 +1,15 @@
+2017-04-30 Jason Marcell <[email protected]>
+
+ Cherry-pick r215990. rdar://problem/31906525
+
+ 2017-04-30 Dan Bernstein <[email protected]>
+
+ <rdar://problem/31906525> WebCore-7604.1.19 has failed to build
+
+ * platform/ios/WebItemProviderPasteboard.mm:
+ (-[WebItemProviderPasteboard setItemsUsingRegistrationInfoLists:]): Resolved type ambiguity
+ by using allocUIItemProviderInstance() instead of [getUIItemProviderClass() alloc].
+
2017-04-28 Jason Marcell <[email protected]>
Cherry-pick r215917. rdar://problem/31878197
Modified: tags/Safari-604.1.19.1/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm (215998 => 215999)
--- tags/Safari-604.1.19.1/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm 2017-04-30 21:23:01 UTC (rev 215998)
+++ tags/Safari-604.1.19.1/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm 2017-04-30 21:24:37 UTC (rev 215999)
@@ -273,7 +273,7 @@
if (!itemList.numberOfItems)
continue;
- auto itemProvider = adoptNS([[getUIItemProviderClass() alloc] init]);
+ auto itemProvider = adoptNS([allocUIItemProviderInstance() init]);
[itemList enumerateItems:[itemProvider] (WebItemProviderRegistrationInfo *item, NSUInteger) {
if (item.representingObject) {
[itemProvider registerObject:item.representingObject visibility:UIItemProviderRepresentationOptionsVisibilityAll];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
