Title: [231834] trunk/Source/WebCore/PAL
- Revision
- 231834
- Author
- [email protected]
- Date
- 2018-05-15 18:57:50 -0700 (Tue, 15 May 2018)
Log Message
PasteboardWebContent's dataInAttributedStringFormat fails to deserialize in the UI process when copying a selection
https://bugs.webkit.org/show_bug.cgi?id=185667
<rdar://problem/40135132>
Reviewed by Tim Horton.
Fixes error logging emitted when copying a text selection due to the secure archiver on iOS being unable to
handle NSAttributedString in the builds where the errors manifest. USE_SECURE_ARCHIVER_FOR_ATTRIBUTED_STRING is
defined to be 1, despite not having the fix for <rdar://problem/31376830>.
* pal/spi/cocoa/NSKeyedArchiverSPI.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (231833 => 231834)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-05-16 01:42:05 UTC (rev 231833)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-05-16 01:57:50 UTC (rev 231834)
@@ -1,3 +1,17 @@
+2018-05-15 Wenson Hsieh <[email protected]>
+
+ PasteboardWebContent's dataInAttributedStringFormat fails to deserialize in the UI process when copying a selection
+ https://bugs.webkit.org/show_bug.cgi?id=185667
+ <rdar://problem/40135132>
+
+ Reviewed by Tim Horton.
+
+ Fixes error logging emitted when copying a text selection due to the secure archiver on iOS being unable to
+ handle NSAttributedString in the builds where the errors manifest. USE_SECURE_ARCHIVER_FOR_ATTRIBUTED_STRING is
+ defined to be 1, despite not having the fix for <rdar://problem/31376830>.
+
+ * pal/spi/cocoa/NSKeyedArchiverSPI.h:
+
2018-05-11 Dan Bernstein <[email protected]>
Follow-up build fix to r231721.
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h (231833 => 231834)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h 2018-05-16 01:42:05 UTC (rev 231833)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h 2018-05-16 01:57:50 UTC (rev 231834)
@@ -31,7 +31,7 @@
#define USE_SECURE_ARCHIVER_API ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101302 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110200) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 40200) || (PLATFORM(TVOS) && __TV_OS_VERSION_MIN_REQUIRED >= 110200))
-#define USE_SECURE_ARCHIVER_FOR_ATTRIBUTED_STRING ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101302 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 50000) || (PLATFORM(TVOS) && __TV_OS_VERSION_MIN_REQUIRED >= 120000))
+#define USE_SECURE_ARCHIVER_FOR_ATTRIBUTED_STRING ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101302 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(TVOS) && __TV_OS_VERSION_MIN_REQUIRED >= 130000))
#if USE(SECURE_ARCHIVER_API)
#if USE(APPLE_INTERNAL_SDK)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
