Attachment 339344 Details for Bug 185205 – Patch

[patch] Patch

bug-185205-20180502144223.patch (text/plain), 7.30 KB, created by Aditya Keerthi on 2018-05-02 14:42:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aditya Keerthi

Created: 2018-05-02 14:42:23 PDT

Size: 7.30 KB

patch

obsolete

>Subversion Revision: 231206
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2a5ab73430be9982cec3adf5efbe9e40c45dd816..eeda46ef4e32261a4873707958a05edb18ec3ddf 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-05-02  Aditya Keerthi  <akeerthi@apple.com>
>+
>+        Can't copy and paste URLs that have no title into Mail (macOS)
>+        https://bugs.webkit.org/show_bug.cgi?id=185205
>+        <rdar://problem/36352406>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The pasteboardURL generated has an empty title for URLs without titles. Currently, the pasteboardURL.title is being saved to the pasteboard.
>+
>+        To fix the error, we check whether the title is empty and instead save the lastPathComponent to the pasteboard. This matches current behavior as the fallback title.
>+
>+        Augmented WebKitLegacy.ContextMenuCanCopyURL test
>+
>+        * platform/mac/PasteboardMac.mm:
>+        (WebCore::writeURLForTypes):
>+
> 2018-05-01  Oleksandr Skachkov  <gskachkov@gmail.com>
> 
>         WebAssembly: add support for stream APIs - JavaScript API
>diff --git a/Source/WebCore/platform/mac/PasteboardMac.mm b/Source/WebCore/platform/mac/PasteboardMac.mm
>index 3658dd1ef496bc14ce2cc3738bb65dd28e347e7b..8757a73654ea858d88ba765db3e5a8380ad726d0 100644
>--- a/Source/WebCore/platform/mac/PasteboardMac.mm
>+++ b/Source/WebCore/platform/mac/PasteboardMac.mm
>@@ -199,7 +199,7 @@ static long writeURLForTypes(const Vector<String>& types, const String& pasteboa
>     if (types.contains(WebURLsWithTitlesPboardType)) {
>         Vector<String> paths;
>         paths.append([cocoaURL absoluteString]);
>-        paths.append(pasteboardURL.title.stripWhiteSpace());
>+        paths.append([title stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]);
>         newChangeCount = platformStrategies()->pasteboardStrategy()->setPathnamesForType(paths, WebURLsWithTitlesPboardType, pasteboardName);
>     }
>     if (types.contains(String(legacyURLPasteboardType())))
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e443253124c236bc7dea7c9e5ddcfe083b8fd449..3df54d241eaef7789cd76b4c54dc853b89be467a 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-02  Aditya Keerthi  <akeerthi@apple.com>
>+
>+        Can't copy and paste URLs that have no title into Mail (macOS)
>+        https://bugs.webkit.org/show_bug.cgi?id=185205
>+        <rdar://problem/36352406>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added test to verify behavior when copying and pasting a URL without a title.
>+
>+        * TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.html:
>+        * TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm:
>+        (TestWebKitAPI::TEST):
>+
> 2018-05-01  Ross Kirsling  <ross.kirsling@sony.com>
> 
>         [WinCairo] Align buildbot test stages with AppleWin.
>diff --git a/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.html b/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.html
>index 3147603ce4c1f4b98b372cdcbfbcdeeed0500e33..c0cc607a29ad07463660e6bed8f193803b3f6d35 100644
>--- a/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.html
>+++ b/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.html
>@@ -1,4 +1,4 @@
> <head>
> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
> </head>
>-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<a href='http://www.webkit.org/'>Click me</a>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<a href='http://xn--ls8h.la/'>http://ð©.la</a>.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
>\ No newline at end of file
>+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<a href='http://www.webkit.org/'>Click me</a>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<a href='http://xn--ls8h.la/'>http://ð©.la</a>.Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<a href='https://www.quirksmode.org/html5/videos/big_buck_bunny.mp4' style='background: #000000; display: block; width: 200px; height: 200px;'></a>
>diff --git a/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm b/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm
>index 8350f4b1c93872f420d1795a41f0b7bc16ad7bb5..7f25ab4df3c8d20fec365ef013fa9aa90216903b 100644
>--- a/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm
>+++ b/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm
>@@ -110,6 +110,13 @@ TEST(WebKitLegacy, ContextMenuCanCopyURL)
>     NSArray * titles = [WebURLsWithTitles titlesFromPasteboard: [NSPasteboard generalPasteboard]];
>     EXPECT_WK_STREQ(@"http://xn--ls8h.la/", [[urls objectAtIndex:0] absoluteString]);
>     EXPECT_WK_STREQ(@"http://ð©.la", [titles objectAtIndex:0]);
>+
>+    contextMenuCopyLink(webView.get(), 2);
>+
>+    urls = [WebURLsWithTitles URLsFromPasteboard: [NSPasteboard generalPasteboard]];
>+    titles = [WebURLsWithTitles titlesFromPasteboard: [NSPasteboard generalPasteboard]];
>+    EXPECT_WK_STREQ(@"https://www.quirksmode.org/html5/videos/big_buck_bunny.mp4", [[urls objectAtIndex:0] absoluteString]);
>+    EXPECT_WK_STREQ(@"big_buck_bunny.mp4", [titles objectAtIndex:0]);
> }
> 
> } // namespace TestWebKitAPI

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 185205: 339338 | 339344 | 339354