Title: [222597] trunk/Source/WebCore
- Revision
- 222597
- Author
- [email protected]
- Date
- 2017-09-27 20:58:19 -0700 (Wed, 27 Sep 2017)
Log Message
Unreviewed, fix the internal build after r222596 and r222595.
Guarding code in PlatformPasteboardIOS.mm TARGET_OS_IPHONE did not have the intended effect.
* platform/ios/PlatformPasteboardIOS.mm:
(WebCore::PlatformPasteboard::typesSafeForDOMToReadAndWrite const):
(WebCore::PlatformPasteboard::write):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (222596 => 222597)
--- trunk/Source/WebCore/ChangeLog 2017-09-28 03:18:50 UTC (rev 222596)
+++ trunk/Source/WebCore/ChangeLog 2017-09-28 03:58:19 UTC (rev 222597)
@@ -1,5 +1,15 @@
2017-09-27 Wenson Hsieh <[email protected]>
+ Unreviewed, fix the internal build after r222596 and r222595.
+
+ Guarding code in PlatformPasteboardIOS.mm TARGET_OS_IPHONE did not have the intended effect.
+
+ * platform/ios/PlatformPasteboardIOS.mm:
+ (WebCore::PlatformPasteboard::typesSafeForDOMToReadAndWrite const):
+ (WebCore::PlatformPasteboard::write):
+
+2017-09-27 Wenson Hsieh <[email protected]>
+
Unreviewed, fix the internal build after r222595.
Add missing iOS compiler guards.
Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (222596 => 222597)
--- trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2017-09-28 03:18:50 UTC (rev 222596)
+++ trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2017-09-28 03:58:19 UTC (rev 222597)
@@ -436,7 +436,7 @@
Vector<String> PlatformPasteboard::typesSafeForDOMToReadAndWrite() const
{
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS
ListHashSet<String> domPasteboardTypes;
for (NSItemProvider *provider in [m_pasteboard itemProviders]) {
if (!provider.teamData.length)
@@ -483,7 +483,7 @@
long PlatformPasteboard::write(const PasteboardCustomData& data)
{
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS
auto representationsToRegister = adoptNS([[WebItemProviderRegistrationInfoList alloc] init]);
[representationsToRegister setPreferredPresentationStyle:WebPreferredPresentationStyleInline];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
