Unreviewed, fix the internal build after r222596 and r222595.
authorwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Sep 2017 03:58:19 +0000 (03:58 +0000)
committerwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Sep 2017 03:58:19 +0000 (03:58 +0000)
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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@222597 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index efadda8..4a02e8e 100644 (file)
@@ -1,5 +1,15 @@
 2017-09-27  Wenson Hsieh  <wenson_hsieh@apple.com>
 
+        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  <wenson_hsieh@apple.com>
+
         Unreviewed, fix the internal build after r222595.
 
         Add missing iOS compiler guards.
index 8bdfd57..aaa4b36 100644 (file)
@@ -436,7 +436,7 @@ static const char *safeTypeForDOMToReadAndWriteForPlatformType(const String& pla
 
 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 @@ Vector<String> PlatformPasteboard::typesSafeForDOMToReadAndWrite() const
 
 long PlatformPasteboard::write(const PasteboardCustomData& data)
 {
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS
     auto representationsToRegister = adoptNS([[WebItemProviderRegistrationInfoList alloc] init]);
     [representationsToRegister setPreferredPresentationStyle:WebPreferredPresentationStyleInline];