Changeset 222597 in webkit

Timestamp:

Sep 27, 2017 8:58:19 PM (7 years ago)

Author:

Wenson Hsieh

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/PlatformPasteboardIOS.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

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

@@ -437 +437 @@
 Vector<String> PlatformPasteboard::typesSafeForDOMToReadAndWrite() const
 {
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS
     ListHashSet<String> domPasteboardTypes;
     for (NSItemProvider *provider in [m_pasteboard itemProviders]) {
@@ -484 +484 @@
 long PlatformPasteboard::write(const PasteboardCustomData& data)
 {
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS
     auto representationsToRegister = adoptNS([[WebItemProviderRegistrationInfoList alloc] init]);
     [representationsToRegister setPreferredPresentationStyle:WebPreferredPresentationStyleInline];