Changeset 233436 in webkit

Timestamp:

Jul 2, 2018 2:52:18 PM (6 years ago)

Author:

Megan Gardner

Message:

Enable copy paste on iOS apps for Mac
​https://bugs.webkit.org/show_bug.cgi?id=187194
<rdar://problem/41451148>

Reviewed by Darin Adler.

Difficult to test this platform.

UIKit doesn't support itemProviders for iOS apps for Mac, so we need to revert to the
older way of setting a dictionary of objects and keys for items. Not everything is
availble in this form, and we haven't cleaned up our itemProvider code yet, so we
need to case some things out for now. Hopefully in the future, this will be implmented
and can just work as expected, but for now, this is the best workaround.

• platform/ios/PlatformPasteboardIOS.mm:

(WebCore::registerItemToPasteboard):
(WebCore::PlatformPasteboard::write):
(WebCore::PlatformPasteboard::readURL):

• platform/ios/WebItemProviderPasteboard.h:
• platform/ios/WebItemProviderPasteboard.mm:

(-[WebItemProviderRegistrationInfoList itemProvider]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/PlatformPasteboardIOS.mm (modified) (6 diffs)
• platform/ios/WebItemProviderPasteboard.h (modified) (1 diff)
• platform/ios/WebItemProviderPasteboard.mm (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-07-02  Megan Gardner  <megan_gardner@apple.com>
+
+        Enable copy paste on iOS apps for Mac
+        https://bugs.webkit.org/show_bug.cgi?id=187194
+        <rdar://problem/41451148>
+
+        Reviewed by Darin Adler.
+
+        Difficult to test this platform.
+
+        UIKit doesn't support itemProviders for iOS apps for Mac, so we need to revert to the
+        older way of setting a dictionary of objects and keys for items. Not everything is
+        availble in this form, and we haven't cleaned up our itemProvider code yet, so we 
+        need to case some things out for now. Hopefully in the future, this will be implmented
+        and can just work as expected, but for now, this is the best workaround.
+
+        * platform/ios/PlatformPasteboardIOS.mm:
+        (WebCore::registerItemToPasteboard):
+        (WebCore::PlatformPasteboard::write):
+        (WebCore::PlatformPasteboard::readURL):
+        * platform/ios/WebItemProviderPasteboard.h:
+        * platform/ios/WebItemProviderPasteboard.mm:
+        (-[WebItemProviderRegistrationInfoList itemProvider]):
+
 2018-07-02  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm

@@ -46 +46 @@
 #import <wtf/text/StringHash.h>
 
-#define PASTEBOARD_SUPPORTS_ITEM_PROVIDERS (PLATFORM(IOS) && !(PLATFORM(WATCHOS) || PLATFORM(APPLETV) || ENABLE(MINIMAL_SIMULATOR)))
+#define PASTEBOARD_SUPPORTS_ITEM_PROVIDERS (PLATFORM(IOS) && !(PLATFORM(WATCHOS) || PLATFORM(APPLETV)))
+#define NSURL_SUPPORTS_TITLE (!ENABLE(MINIMAL_SIMULATOR))
 
 SOFT_LINK_FRAMEWORK(UIKit)
@@ -289 +290 @@
 static void registerItemToPasteboard(WebItemProviderRegistrationInfoList *representationsToRegister, id <AbstractPasteboard> pasteboard)
 {
+#if ENABLE(MINIMAL_SIMULATOR)
+    auto itemDictionary = adoptNS([[NSMutableDictionary alloc] init]);
+    [representationsToRegister enumerateItems:[itemDictionary] (id <WebItemProviderRegistrar> item, NSUInteger) {
+        if ([item respondsToSelector:@selector(typeIdentifierForClient)] && [item respondsToSelector:@selector(dataForClient)])
+            [itemDictionary setObject:item.dataForClient forKey:item.typeIdentifierForClient];
+    }];
+    [pasteboard setItems:@[ itemDictionary.get() ]];
+#else
     if (UIItemProvider *itemProvider = representationsToRegister.itemProvider)
         [pasteboard setItemProviders:@[ itemProvider ]];
@@ -296 +305 @@
     if ([pasteboard respondsToSelector:@selector(stageRegistrationList:)])
         [pasteboard stageRegistrationList:representationsToRegister];
+#endif
+    
 }
 
@@ -387 +398 @@
     auto& pasteboardURL = pasteboardImage.url;
     if (NSURL *nsURL = pasteboardURL.url) {
+#if NSURL_SUPPORTS_TITLE
         nsURL._title = pasteboardURL.title.isEmpty() ? userVisibleString(pasteboardURL.url) : (NSString *)pasteboardURL.title;
+#endif
         [representationsToRegister addRepresentingObject:nsURL];
     }
@@ -417 +430 @@
 
     if (NSURL *nsURL = url.url) {
+#if NSURL_SUPPORTS_TITLE
         if (!url.title.isEmpty())
             nsURL._title = url.title;
+#endif
         [representationsToRegister addRepresentingObject:nsURL];
         [representationsToRegister addRepresentingObject:(NSString *)url.url.string()];
@@ -659 +674 @@
         return { };
 
-#if PASTEBOARD_SUPPORTS_ITEM_PROVIDERS
+#if PASTEBOARD_SUPPORTS_ITEM_PROVIDERS && NSURL_SUPPORTS_TITLE
     title = [url _title];
 #else

trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h

@@ -27 +27 @@
 
 #if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+
+// UIItemProviders are not implemented for iOS apps for Mac, because they were depricated last year.
+// We need to switch over to NSItemProviders everywhere. This should just be a temporary fix.
+#if defined(TARGET_OS_IOSMAC) && TARGET_OS_IOSMAC
+
+#define UIItemProvider NSItemProvider
+#define UIItemProviderReading NSItemProviderReading
+#define UIItemProviderWriting NSItemProviderWriting
+#define UIItemProviderRepresentationOptionsVisibilityAll NSItemProviderRepresentationVisibilityAll
+
+#endif
 
 @class UIItemProvider;

trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm

@@ -27 +27 @@
 #import "WebItemProviderPasteboard.h"
 
-#if ENABLE(DATA_INTERACTION)
+#if ENABLE(DATA_INTERACTION) || ENABLE(MINIMAL_SIMULATOR)
 
 #import <Foundation/NSItemProvider.h>
@@ -257 +257 @@
 }
 
+#if !ENABLE(MINIMAL_SIMULATOR)
 static UIPreferredPresentationStyle uiPreferredPresentationStyle(WebPreferredPresentationStyle style)
 {
@@ -271 +272 @@
     }
 }
+#endif
 
 - (UIItemProvider *)itemProvider
@@ -280 +282 @@
     for (id <WebItemProviderRegistrar> representation in _representations.get())
         [representation registerItemProvider:itemProvider.get()];
+    [itemProvider setSuggestedName:self.suggestedName];
+    // UIItemProviders are not implemented for iOS apps for Mac, because they were depricated last year.
+    // We need to switch over to NSItemProviders everywhere. This should just be a temporary fix.
+#if !ENABLE(MINIMAL_SIMULATOR)
     [itemProvider setPreferredPresentationSize:self.preferredPresentationSize];
-    [itemProvider setSuggestedName:self.suggestedName];
     [itemProvider setPreferredPresentationStyle:uiPreferredPresentationStyle(self.preferredPresentationStyle)];
     [itemProvider setTeamData:self.teamData];
+#endif
     return itemProvider.autorelease();
 }
@@ -833 +839 @@
 @end
 
-#endif // ENABLE(DATA_INTERACTION)
+#endif // ENABLE(DATA_INTERACTION) || ENABLE(MINIMAL_SIMULATOR)