Attachment 340453 Details for Bug 185667 – Patch

[patch] Patch

bug-185667-20180515174520.patch (text/plain), 2.46 KB, created by Wenson Hsieh on 2018-05-15 17:45:21 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2018-05-15 17:45:21 PDT

Size: 2.46 KB

patch

obsolete

>Subversion Revision: 231784
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index d0a25c58f1f4c882c069276b13b2e24330be68f7..9b742255b0338b9729bdace4aedd7351b8e70b1b 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-15  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        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 NOBODY (OOPS!).
>+
>+        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  <mitz@apple.com>
> 
>         Follow-up build fix to r231721.
>diff --git a/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h
>index 8ad1352a9ae97d0dcba8e6323d51bf5dc34433c1..55a64886a880f5b90ea2da6cf51aba4ba67c425d 100644
>--- a/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h
>@@ -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)

Actions: View | Formatted Diff | Diff

Attachments on bug 185667: 340453