Title: [251236] trunk/Source/WebCore
- Revision
- 251236
- Author
- wenson_hs...@apple.com
- Date
- 2019-10-17 09:04:54 -0700 (Thu, 17 Oct 2019)
Log Message
Unreviewed, fix watchOS and tvOS builds after r251224
* platform/ios/PlatformPasteboardIOS.mm:
(WebCore::shouldTreatAtLeastOneTypeAsFile):
Move the `shouldTreatAtLeastOneTypeAsFile` helper function out of the `PASTEBOARD_SUPPORTS_ITEM_PROVIDERS`
section, and into generic iOS-family code so that it can be used in `pasteboardMayContainFilePaths`.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (251235 => 251236)
--- trunk/Source/WebCore/ChangeLog 2019-10-17 15:47:43 UTC (rev 251235)
+++ trunk/Source/WebCore/ChangeLog 2019-10-17 16:04:54 UTC (rev 251236)
@@ -1,3 +1,13 @@
+2019-10-17 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Unreviewed, fix watchOS and tvOS builds after r251224
+
+ * platform/ios/PlatformPasteboardIOS.mm:
+ (WebCore::shouldTreatAtLeastOneTypeAsFile):
+
+ Move the `shouldTreatAtLeastOneTypeAsFile` helper function out of the `PASTEBOARD_SUPPORTS_ITEM_PROVIDERS`
+ section, and into generic iOS-family code so that it can be used in `pasteboardMayContainFilePaths`.
+
2019-10-17 Youenn Fablet <you...@apple.com>
MultiChannelResampler does not need to recreate a ChannelProvider for every process call
Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (251235 => 251236)
--- trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2019-10-17 15:47:43 UTC (rev 251235)
+++ trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2019-10-17 16:04:54 UTC (rev 251236)
@@ -95,6 +95,15 @@
return [m_pasteboard respondsToSelector:@selector(numberOfFiles)] ? [m_pasteboard numberOfFiles] : 0;
}
+static bool shouldTreatAtLeastOneTypeAsFile(NSArray<NSString *> *platformTypes)
+{
+ for (NSString *type in platformTypes) {
+ if (Pasteboard::shouldTreatCocoaTypeAsFile(type))
+ return true;
+ }
+ return false;
+}
+
#if PASTEBOARD_SUPPORTS_ITEM_PROVIDERS
static const char *safeTypeForDOMToReadAndWriteForPlatformType(const String& platformType)
@@ -155,15 +164,6 @@
#endif // PASTEBOARD_SUPPORTS_PRESENTATION_STYLE_AND_TEAM_DATA
-static bool shouldTreatAtLeastOneTypeAsFile(NSArray <NSString *> *platformTypes)
-{
- for (NSString *type in platformTypes) {
- if (Pasteboard::shouldTreatCocoaTypeAsFile(type))
- return true;
- }
- return false;
-}
-
PasteboardItemInfo PlatformPasteboard::informationForItemAtIndex(size_t index)
{
if (index >= static_cast<NSUInteger>([m_pasteboard numberOfItems]))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
