Title: [222596] trunk/Source/WebCore
- Revision
- 222596
- Author
- [email protected]
- Date
- 2017-09-27 20:18:50 -0700 (Wed, 27 Sep 2017)
Log Message
Unreviewed, fix the internal build after r222595.
Add missing iOS compiler guards.
* platform/ios/PlatformPasteboardIOS.mm:
(WebCore::PlatformPasteboard::typesSafeForDOMToReadAndWrite const):
(WebCore::PlatformPasteboard::write):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (222595 => 222596)
--- trunk/Source/WebCore/ChangeLog 2017-09-28 02:29:16 UTC (rev 222595)
+++ trunk/Source/WebCore/ChangeLog 2017-09-28 03:18:50 UTC (rev 222596)
@@ -1,5 +1,15 @@
2017-09-27 Wenson Hsieh <[email protected]>
+ Unreviewed, fix the internal build after r222595.
+
+ Add missing iOS compiler guards.
+
+ * platform/ios/PlatformPasteboardIOS.mm:
+ (WebCore::PlatformPasteboard::typesSafeForDOMToReadAndWrite const):
+ (WebCore::PlatformPasteboard::write):
+
+2017-09-27 Wenson Hsieh <[email protected]>
+
Drag event DataTransfer has unexpected types "dyn.ah62d4..."
https://bugs.webkit.org/show_bug.cgi?id=172526
<rdar://problem/32396081>
Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (222595 => 222596)
--- trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2017-09-28 02:29:16 UTC (rev 222595)
+++ trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2017-09-28 03:18:50 UTC (rev 222596)
@@ -436,6 +436,7 @@
Vector<String> PlatformPasteboard::typesSafeForDOMToReadAndWrite() const
{
+#if TARGET_OS_IPHONE
ListHashSet<String> domPasteboardTypes;
for (NSItemProvider *provider in [m_pasteboard itemProviders]) {
if (!provider.teamData.length)
@@ -475,10 +476,14 @@
Vector<String> result;
copyToVector(domPasteboardTypes, result);
return result;
+#else
+ return { };
+#endif
}
long PlatformPasteboard::write(const PasteboardCustomData& data)
{
+#if TARGET_OS_IPHONE
auto representationsToRegister = adoptNS([[WebItemProviderRegistrationInfoList alloc] init]);
[representationsToRegister setPreferredPresentationStyle:WebPreferredPresentationStyleInline];
@@ -514,6 +519,9 @@
registerItemToPasteboard(representationsToRegister.get(), m_pasteboard.get());
return [m_pasteboard changeCount];
+#else
+ UNUSED_PARAM(data);
+#endif
}
int PlatformPasteboard::count()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
