Attachment 357650 Details for Bug 192842 – Patch

[patch] Patch

bug-192842-20181218204928.patch (text/plain), 4.18 KB, created by Wenson Hsieh on 2018-12-18 20:49:29 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2018-12-18 20:49:29 PST

Size: 4.18 KB

patch

obsolete

>Subversion Revision: 239346
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c169dada99aee25a8b2c6f6871d27532b48729e0..c48b0a079c83fdcaaa8b48320b6d726a46be90db 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-12-18  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [iOS] A copied text selection is pasted as a web archive attachment in the entry view in Messages
>+        https://bugs.webkit.org/show_bug.cgi?id=192842
>+        <rdar://problem/46823586>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Temporarily revert a behavior change introduced by r238661, where we now add "com.apple.webarchive" as a
>+        registered UTI when dragging or copying a text selection. This broke the Messages app on iOS, which currently
>+        inserts a copied or dragged text selection from WebKit-based views as a web archive file attachment. A fix for
>+        this is internally tracked in <rdar://problem/46830277>.
>+
>+        * platform/ios/PlatformPasteboardIOS.mm:
>+        (WebCore::PlatformPasteboard::write):
>+
> 2018-12-18  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         Web Inspector: m3u8 content not shown, it should be text
>diff --git a/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm b/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm
>index 8d89bb3a8dd87f513d9ea0eaadf9f28459c6d976..e9c3a31575148c3484ded63bed5e243dde25ed57 100644
>--- a/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm
>+++ b/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm
>@@ -369,10 +369,13 @@ void PlatformPasteboard::write(const PasteboardWebContent& content)
> 
>     if (content.dataInWebArchiveFormat) {
>         auto webArchiveData = content.dataInWebArchiveFormat->createNSData();
>-#if !PLATFORM(IOSMAC)
>-        [representationsToRegister addData:webArchiveData.get() forType:WebArchivePboardType];
>+#if PLATFORM(IOSMAC)
>+        NSString *webArchiveType = (__bridge NSString *)kUTTypeWebArchive;
>+#else
>+        // FIXME: We should additionally register "com.apple.webarchive" once <rdar://problem/46830277> is fixed.
>+        NSString *webArchiveType = WebArchivePboardType;
> #endif
>-        [representationsToRegister addData:webArchiveData.get() forType:(__bridge NSString *)kUTTypeWebArchive];
>+        [representationsToRegister addData:webArchiveData.get() forType:webArchiveType];
>     }
> 
>     if (content.dataInAttributedStringFormat) {
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index cf5a6af1c5ec1e06ac6833b17eb5e63c3e4a6b33..64cacb14fe0dfebc8b05a531dacf41480e669bde 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-12-18  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [iOS] A copied text selection is pasted as a web archive attachment in the entry view in Messages
>+        https://bugs.webkit.org/show_bug.cgi?id=192842
>+        <rdar://problem/46823586>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Adjusts an existing API test to verify that "com.apple.webarchive" is not one of the types registered to the
>+        item provider when dragging a rich text selection.
>+
>+        * TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm:
>+
> 2018-12-18  Jonathan Bedard  <jbedard@apple.com>
> 
>         webkitpy: Ignore device type for test when using --force
>diff --git a/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm b/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm
>index 8ef395ed57a49e932a1fe36b49b3719faafcb08b..44bc15094c62f542f011124b36830608e9e13cc8 100644
>--- a/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm
>+++ b/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm
>@@ -372,6 +372,9 @@ TEST(DragAndDropTests, ContentEditableToContentEditable)
>     checkSelectionRectsWithLogging(@[ makeCGRectValue(1, 201, 961, 227) ], [simulator finalSelectionRects]);
>     checkRichTextTypePrecedesPlainTextType(simulator.get());
>     EXPECT_TRUE([simulator lastKnownDropProposal].precise);
>+
>+    // FIXME: Once <rdar://problem/46830277> is fixed, we should add "com.apple.webarchive" as a registered pasteboard type and rebaseline this expectation.
>+    EXPECT_FALSE([[[simulator sourceItemProviders].firstObject registeredTypeIdentifiers] containsObject:(__bridge NSString *)kUTTypeWebArchive]);
> }
> 
> TEST(DragAndDropTests, ContentEditableToTextarea)

Actions: View | Formatted Diff | Diff

Attachments on bug 192842: 357650